From 07f62706d0c626f219c16e194e1475844abe86da Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 21 Aug 2012 13:06:40 -0700 Subject: [PATCH] Make the Xcode layout not look horrible --- atom.gyp | 38 +- atom/atom/cefclient.rc | 172 ++ atom/atom/cefclient_gtk.cpp | 408 ++++ atom/atom/cefclient_mac.h | 12 + atom/atom/cefclient_mac.mm | 152 ++ atom/atom/cefclient_win.cpp | 546 +++++ atom/atom/client_handler.cpp | 308 +++ atom/atom/client_handler.h | 280 +++ atom/atom/client_handler_gtk.cpp | 63 + atom/atom/client_handler_mac.mm | 32 + atom/atom/client_handler_win.cpp | 86 + atom/atom/mac/English.lproj/InfoPlist.strings | 3 + atom/atom/mac/English.lproj/MainMenu.xib | 1983 +++++++++++++++++ atom/atom/mac/atom.icns | Bin 0 -> 63727 bytes atom/atom/mac/helper-info.plist | 30 + atom/atom/mac/info.plist | 28 + atom/atom/main_mac.mm | 29 + atom/atom/process_helper_mac.cpp | 7 + atom/atom/res/cefclient.ico | Bin 0 -> 23558 bytes atom/atom/res/small.ico | Bin 0 -> 23558 bytes atom/atom/util.h | 19 + build-project.sh | 1 + cef/cef_paths.gypi | 363 +++ cef/cef_paths2.gypi | 175 ++ .../frameworks/cef_paths.gypi | 0 .../frameworks/cef_paths2.gypi | 0 cef/{ => frameworks}/ffmpegsumo.so | Bin cef/{ => frameworks}/libcef.dylib | Bin .../libcef.dylib.dSYM/Contents/Info.plist | 0 .../Contents/Resources/DWARF/libcef.dylib | Bin {include => cef/include}/capi/cef_app_capi.h | 0 {include => cef/include}/capi/cef_base_capi.h | 0 .../include}/capi/cef_browser_capi.h | 0 .../capi/cef_browser_process_handler_capi.h | 0 .../include}/capi/cef_callback_capi.h | 0 .../include}/capi/cef_client_capi.h | 0 .../include}/capi/cef_command_line_capi.h | 0 .../capi/cef_context_menu_handler_capi.h | 0 .../include}/capi/cef_cookie_capi.h | 0 .../include}/capi/cef_display_handler_capi.h | 0 {include => cef/include}/capi/cef_dom_capi.h | 0 .../include}/capi/cef_download_handler_capi.h | 0 .../include}/capi/cef_download_item_capi.h | 0 .../include}/capi/cef_focus_handler_capi.h | 0 .../include}/capi/cef_frame_capi.h | 0 .../capi/cef_geolocation_handler_capi.h | 0 .../include}/capi/cef_jsdialog_handler_capi.h | 0 .../include}/capi/cef_keyboard_handler_capi.h | 0 .../capi/cef_life_span_handler_capi.h | 0 .../include}/capi/cef_load_handler_capi.h | 0 .../include}/capi/cef_menu_model_capi.h | 0 .../include}/capi/cef_origin_whitelist_capi.h | 0 .../include}/capi/cef_path_util_capi.h | 0 .../include}/capi/cef_process_message_capi.h | 0 .../include}/capi/cef_process_util_capi.h | 0 .../include}/capi/cef_proxy_handler_capi.h | 0 .../capi/cef_render_process_handler_capi.h | 0 .../include}/capi/cef_request_capi.h | 0 .../include}/capi/cef_request_handler_capi.h | 0 .../capi/cef_resource_bundle_handler_capi.h | 0 .../include}/capi/cef_resource_handler_capi.h | 0 .../include}/capi/cef_response_capi.h | 0 .../include}/capi/cef_scheme_capi.h | 0 .../include}/capi/cef_stream_capi.h | 0 .../include}/capi/cef_string_visitor_capi.h | 0 {include => cef/include}/capi/cef_task_capi.h | 0 {include => cef/include}/capi/cef_url_capi.h | 0 .../include}/capi/cef_urlrequest_capi.h | 0 {include => cef/include}/capi/cef_v8_capi.h | 0 .../include}/capi/cef_values_capi.h | 0 .../include}/capi/cef_web_plugin_capi.h | 0 .../include}/capi/cef_xml_reader_capi.h | 0 .../include}/capi/cef_zip_reader_capi.h | 0 {include => cef/include}/cef_app.h | 0 .../include}/cef_application_mac.h | 0 {include => cef/include}/cef_base.h | 0 {include => cef/include}/cef_browser.h | 0 .../include}/cef_browser_process_handler.h | 0 {include => cef/include}/cef_callback.h | 0 {include => cef/include}/cef_client.h | 0 {include => cef/include}/cef_command_line.h | 0 .../include}/cef_context_menu_handler.h | 0 {include => cef/include}/cef_cookie.h | 0 .../include}/cef_display_handler.h | 0 {include => cef/include}/cef_dom.h | 0 .../include}/cef_download_handler.h | 0 {include => cef/include}/cef_download_item.h | 0 {include => cef/include}/cef_focus_handler.h | 0 {include => cef/include}/cef_frame.h | 0 .../include}/cef_geolocation_handler.h | 0 .../include}/cef_jsdialog_handler.h | 0 .../include}/cef_keyboard_handler.h | 0 .../include}/cef_life_span_handler.h | 0 {include => cef/include}/cef_load_handler.h | 0 {include => cef/include}/cef_menu_model.h | 0 .../include}/cef_origin_whitelist.h | 0 {include => cef/include}/cef_pack_resources.h | 0 {include => cef/include}/cef_pack_strings.h | 0 {include => cef/include}/cef_path_util.h | 0 .../include}/cef_process_message.h | 0 {include => cef/include}/cef_process_util.h | 0 {include => cef/include}/cef_proxy_handler.h | 0 .../include}/cef_render_process_handler.h | 0 {include => cef/include}/cef_request.h | 0 .../include}/cef_request_handler.h | 0 .../include}/cef_resource_bundle_handler.h | 0 .../include}/cef_resource_handler.h | 0 {include => cef/include}/cef_response.h | 0 {include => cef/include}/cef_runnable.h | 0 {include => cef/include}/cef_scheme.h | 0 {include => cef/include}/cef_stream.h | 0 {include => cef/include}/cef_string_visitor.h | 0 {include => cef/include}/cef_task.h | 0 {include => cef/include}/cef_url.h | 0 {include => cef/include}/cef_urlrequest.h | 0 {include => cef/include}/cef_v8.h | 0 {include => cef/include}/cef_values.h | 0 {include => cef/include}/cef_version.h | 0 {include => cef/include}/cef_web_plugin.h | 0 {include => cef/include}/cef_xml_reader.h | 0 {include => cef/include}/cef_zip_reader.h | 0 {include => cef/include}/internal/cef_build.h | 0 .../include}/internal/cef_export.h | 0 {include => cef/include}/internal/cef_linux.h | 0 {include => cef/include}/internal/cef_mac.h | 0 {include => cef/include}/internal/cef_ptr.h | 0 .../include}/internal/cef_string.h | 0 .../include}/internal/cef_string_list.h | 0 .../include}/internal/cef_string_map.h | 0 .../include}/internal/cef_string_multimap.h | 0 .../include}/internal/cef_string_types.h | 0 .../include}/internal/cef_string_wrappers.h | 0 {include => cef/include}/internal/cef_time.h | 0 {include => cef/include}/internal/cef_tuple.h | 0 {include => cef/include}/internal/cef_types.h | 0 .../include}/internal/cef_types_linux.h | 0 .../include}/internal/cef_types_mac.h | 0 .../include}/internal/cef_types_win.h | 0 .../include}/internal/cef_types_wrappers.h | 0 {include => cef/include}/internal/cef_win.h | 0 .../include}/wrapper/cef_byte_read_handler.h | 0 .../wrapper/cef_stream_resource_handler.h | 0 .../include}/wrapper/cef_xml_object.h | 0 .../include}/wrapper/cef_zip_archive.h | 0 {libcef_dll => cef/libcef_dll}/cef_logging.h | 0 .../libcef_dll}/cpptoc/app_cpptoc.cc | 0 .../libcef_dll}/cpptoc/app_cpptoc.h | 0 .../cpptoc/auth_callback_cpptoc.cc | 0 .../libcef_dll}/cpptoc/auth_callback_cpptoc.h | 0 .../libcef_dll}/cpptoc/base_cpptoc.h | 0 .../cpptoc/before_download_callback_cpptoc.cc | 0 .../cpptoc/before_download_callback_cpptoc.h | 0 .../libcef_dll}/cpptoc/binary_value_cpptoc.cc | 0 .../libcef_dll}/cpptoc/binary_value_cpptoc.h | 0 .../libcef_dll}/cpptoc/browser_cpptoc.cc | 0 .../libcef_dll}/cpptoc/browser_cpptoc.h | 0 .../libcef_dll}/cpptoc/browser_host_cpptoc.cc | 0 .../libcef_dll}/cpptoc/browser_host_cpptoc.h | 0 .../cpptoc/browser_process_handler_cpptoc.cc | 0 .../cpptoc/browser_process_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/callback_cpptoc.cc | 0 .../libcef_dll}/cpptoc/callback_cpptoc.h | 0 .../libcef_dll}/cpptoc/client_cpptoc.cc | 0 .../libcef_dll}/cpptoc/client_cpptoc.h | 0 .../libcef_dll}/cpptoc/command_line_cpptoc.cc | 0 .../libcef_dll}/cpptoc/command_line_cpptoc.h | 0 .../cpptoc/context_menu_handler_cpptoc.cc | 0 .../cpptoc/context_menu_handler_cpptoc.h | 0 .../cpptoc/context_menu_params_cpptoc.cc | 0 .../cpptoc/context_menu_params_cpptoc.h | 0 .../cpptoc/cookie_manager_cpptoc.cc | 0 .../cpptoc/cookie_manager_cpptoc.h | 0 .../cpptoc/cookie_visitor_cpptoc.cc | 0 .../cpptoc/cookie_visitor_cpptoc.h | 0 .../libcef_dll}/cpptoc/cpptoc.h | 0 .../cpptoc/dictionary_value_cpptoc.cc | 0 .../cpptoc/dictionary_value_cpptoc.h | 0 .../cpptoc/display_handler_cpptoc.cc | 0 .../cpptoc/display_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/domdocument_cpptoc.cc | 0 .../libcef_dll}/cpptoc/domdocument_cpptoc.h | 0 .../libcef_dll}/cpptoc/domevent_cpptoc.cc | 0 .../libcef_dll}/cpptoc/domevent_cpptoc.h | 0 .../cpptoc/domevent_listener_cpptoc.cc | 0 .../cpptoc/domevent_listener_cpptoc.h | 0 .../libcef_dll}/cpptoc/domnode_cpptoc.cc | 0 .../libcef_dll}/cpptoc/domnode_cpptoc.h | 0 .../libcef_dll}/cpptoc/domvisitor_cpptoc.cc | 0 .../libcef_dll}/cpptoc/domvisitor_cpptoc.h | 0 .../cpptoc/download_handler_cpptoc.cc | 0 .../cpptoc/download_handler_cpptoc.h | 0 .../cpptoc/download_item_callback_cpptoc.cc | 0 .../cpptoc/download_item_callback_cpptoc.h | 0 .../cpptoc/download_item_cpptoc.cc | 0 .../libcef_dll}/cpptoc/download_item_cpptoc.h | 0 .../cpptoc/focus_handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/focus_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/frame_cpptoc.cc | 0 .../libcef_dll}/cpptoc/frame_cpptoc.h | 0 .../cpptoc/geolocation_callback_cpptoc.cc | 0 .../cpptoc/geolocation_callback_cpptoc.h | 0 .../cpptoc/geolocation_handler_cpptoc.cc | 0 .../cpptoc/geolocation_handler_cpptoc.h | 0 .../cpptoc/jsdialog_callback_cpptoc.cc | 0 .../cpptoc/jsdialog_callback_cpptoc.h | 0 .../cpptoc/jsdialog_handler_cpptoc.cc | 0 .../cpptoc/jsdialog_handler_cpptoc.h | 0 .../cpptoc/keyboard_handler_cpptoc.cc | 0 .../cpptoc/keyboard_handler_cpptoc.h | 0 .../cpptoc/life_span_handler_cpptoc.cc | 0 .../cpptoc/life_span_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/list_value_cpptoc.cc | 0 .../libcef_dll}/cpptoc/list_value_cpptoc.h | 0 .../libcef_dll}/cpptoc/load_handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/load_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/menu_model_cpptoc.cc | 0 .../libcef_dll}/cpptoc/menu_model_cpptoc.h | 0 .../cpptoc/permission_handler_cpptoc.cc | 0 .../cpptoc/permission_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/post_data_cpptoc.cc | 0 .../libcef_dll}/cpptoc/post_data_cpptoc.h | 0 .../cpptoc/post_data_element_cpptoc.cc | 0 .../cpptoc/post_data_element_cpptoc.h | 0 .../cpptoc/process_message_cpptoc.cc | 0 .../cpptoc/process_message_cpptoc.h | 0 .../cpptoc/proxy_handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/proxy_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/read_handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/read_handler_cpptoc.h | 0 .../cpptoc/render_process_handler_cpptoc.cc | 0 .../cpptoc/render_process_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/request_cpptoc.cc | 0 .../libcef_dll}/cpptoc/request_cpptoc.h | 0 .../cpptoc/request_handler_cpptoc.cc | 0 .../cpptoc/request_handler_cpptoc.h | 0 .../cpptoc/resource_bundle_handler_cpptoc.cc | 0 .../cpptoc/resource_bundle_handler_cpptoc.h | 0 .../cpptoc/resource_handler_cpptoc.cc | 0 .../cpptoc/resource_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/response_cpptoc.cc | 0 .../libcef_dll}/cpptoc/response_cpptoc.h | 0 .../cpptoc/scheme_handler_factory_cpptoc.cc | 0 .../cpptoc/scheme_handler_factory_cpptoc.h | 0 .../cpptoc/scheme_registrar_cpptoc.cc | 0 .../cpptoc/scheme_registrar_cpptoc.h | 0 .../cpptoc/stream_reader_cpptoc.cc | 0 .../libcef_dll}/cpptoc/stream_reader_cpptoc.h | 0 .../cpptoc/stream_writer_cpptoc.cc | 0 .../libcef_dll}/cpptoc/stream_writer_cpptoc.h | 0 .../cpptoc/string_visitor_cpptoc.cc | 0 .../cpptoc/string_visitor_cpptoc.h | 0 .../libcef_dll}/cpptoc/task_cpptoc.cc | 0 .../libcef_dll}/cpptoc/task_cpptoc.h | 0 .../cpptoc/urlrequest_client_cpptoc.cc | 0 .../cpptoc/urlrequest_client_cpptoc.h | 0 .../libcef_dll}/cpptoc/urlrequest_cpptoc.cc | 0 .../libcef_dll}/cpptoc/urlrequest_cpptoc.h | 0 .../libcef_dll}/cpptoc/v8accessor_cpptoc.cc | 0 .../libcef_dll}/cpptoc/v8accessor_cpptoc.h | 0 .../libcef_dll}/cpptoc/v8context_cpptoc.cc | 0 .../libcef_dll}/cpptoc/v8context_cpptoc.h | 0 .../libcef_dll}/cpptoc/v8exception_cpptoc.cc | 0 .../libcef_dll}/cpptoc/v8exception_cpptoc.h | 0 .../libcef_dll}/cpptoc/v8handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/v8handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/v8value_cpptoc.cc | 0 .../libcef_dll}/cpptoc/v8value_cpptoc.h | 0 .../cpptoc/web_plugin_info_cpptoc.cc | 0 .../cpptoc/web_plugin_info_cpptoc.h | 0 .../cpptoc/web_plugin_info_visitor_cpptoc.cc | 0 .../cpptoc/web_plugin_info_visitor_cpptoc.h | 0 .../cpptoc/write_handler_cpptoc.cc | 0 .../libcef_dll}/cpptoc/write_handler_cpptoc.h | 0 .../libcef_dll}/cpptoc/xml_reader_cpptoc.cc | 0 .../libcef_dll}/cpptoc/xml_reader_cpptoc.h | 0 .../libcef_dll}/cpptoc/zip_reader_cpptoc.cc | 0 .../libcef_dll}/cpptoc/zip_reader_cpptoc.h | 0 .../libcef_dll}/ctocpp/app_ctocpp.cc | 0 .../libcef_dll}/ctocpp/app_ctocpp.h | 0 .../ctocpp/auth_callback_ctocpp.cc | 0 .../libcef_dll}/ctocpp/auth_callback_ctocpp.h | 0 .../libcef_dll}/ctocpp/base_ctocpp.h | 0 .../ctocpp/before_download_callback_ctocpp.cc | 0 .../ctocpp/before_download_callback_ctocpp.h | 0 .../libcef_dll}/ctocpp/binary_value_ctocpp.cc | 0 .../libcef_dll}/ctocpp/binary_value_ctocpp.h | 0 .../libcef_dll}/ctocpp/browser_ctocpp.cc | 0 .../libcef_dll}/ctocpp/browser_ctocpp.h | 0 .../libcef_dll}/ctocpp/browser_host_ctocpp.cc | 0 .../libcef_dll}/ctocpp/browser_host_ctocpp.h | 0 .../ctocpp/browser_process_handler_ctocpp.cc | 0 .../ctocpp/browser_process_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/callback_ctocpp.cc | 0 .../libcef_dll}/ctocpp/callback_ctocpp.h | 0 .../libcef_dll}/ctocpp/client_ctocpp.cc | 0 .../libcef_dll}/ctocpp/client_ctocpp.h | 0 .../libcef_dll}/ctocpp/command_line_ctocpp.cc | 0 .../libcef_dll}/ctocpp/command_line_ctocpp.h | 0 .../ctocpp/context_menu_handler_ctocpp.cc | 0 .../ctocpp/context_menu_handler_ctocpp.h | 0 .../ctocpp/context_menu_params_ctocpp.cc | 0 .../ctocpp/context_menu_params_ctocpp.h | 0 .../ctocpp/cookie_manager_ctocpp.cc | 0 .../ctocpp/cookie_manager_ctocpp.h | 0 .../ctocpp/cookie_visitor_ctocpp.cc | 0 .../ctocpp/cookie_visitor_ctocpp.h | 0 .../libcef_dll}/ctocpp/ctocpp.h | 0 .../ctocpp/dictionary_value_ctocpp.cc | 0 .../ctocpp/dictionary_value_ctocpp.h | 0 .../ctocpp/display_handler_ctocpp.cc | 0 .../ctocpp/display_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/domdocument_ctocpp.cc | 0 .../libcef_dll}/ctocpp/domdocument_ctocpp.h | 0 .../libcef_dll}/ctocpp/domevent_ctocpp.cc | 0 .../libcef_dll}/ctocpp/domevent_ctocpp.h | 0 .../ctocpp/domevent_listener_ctocpp.cc | 0 .../ctocpp/domevent_listener_ctocpp.h | 0 .../libcef_dll}/ctocpp/domnode_ctocpp.cc | 0 .../libcef_dll}/ctocpp/domnode_ctocpp.h | 0 .../libcef_dll}/ctocpp/domvisitor_ctocpp.cc | 0 .../libcef_dll}/ctocpp/domvisitor_ctocpp.h | 0 .../ctocpp/download_handler_ctocpp.cc | 0 .../ctocpp/download_handler_ctocpp.h | 0 .../ctocpp/download_item_callback_ctocpp.cc | 0 .../ctocpp/download_item_callback_ctocpp.h | 0 .../ctocpp/download_item_ctocpp.cc | 0 .../libcef_dll}/ctocpp/download_item_ctocpp.h | 0 .../ctocpp/focus_handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/focus_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/frame_ctocpp.cc | 0 .../libcef_dll}/ctocpp/frame_ctocpp.h | 0 .../ctocpp/geolocation_callback_ctocpp.cc | 0 .../ctocpp/geolocation_callback_ctocpp.h | 0 .../ctocpp/geolocation_handler_ctocpp.cc | 0 .../ctocpp/geolocation_handler_ctocpp.h | 0 .../ctocpp/jsdialog_callback_ctocpp.cc | 0 .../ctocpp/jsdialog_callback_ctocpp.h | 0 .../ctocpp/jsdialog_handler_ctocpp.cc | 0 .../ctocpp/jsdialog_handler_ctocpp.h | 0 .../ctocpp/keyboard_handler_ctocpp.cc | 0 .../ctocpp/keyboard_handler_ctocpp.h | 0 .../ctocpp/life_span_handler_ctocpp.cc | 0 .../ctocpp/life_span_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/list_value_ctocpp.cc | 0 .../libcef_dll}/ctocpp/list_value_ctocpp.h | 0 .../libcef_dll}/ctocpp/load_handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/load_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/menu_model_ctocpp.cc | 0 .../libcef_dll}/ctocpp/menu_model_ctocpp.h | 0 .../ctocpp/permission_handler_ctocpp.cc | 0 .../ctocpp/permission_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/post_data_ctocpp.cc | 0 .../libcef_dll}/ctocpp/post_data_ctocpp.h | 0 .../ctocpp/post_data_element_ctocpp.cc | 0 .../ctocpp/post_data_element_ctocpp.h | 0 .../ctocpp/process_message_ctocpp.cc | 0 .../ctocpp/process_message_ctocpp.h | 0 .../ctocpp/proxy_handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/proxy_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/read_handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/read_handler_ctocpp.h | 0 .../ctocpp/render_process_handler_ctocpp.cc | 0 .../ctocpp/render_process_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/request_ctocpp.cc | 0 .../libcef_dll}/ctocpp/request_ctocpp.h | 0 .../ctocpp/request_handler_ctocpp.cc | 0 .../ctocpp/request_handler_ctocpp.h | 0 .../ctocpp/resource_bundle_handler_ctocpp.cc | 0 .../ctocpp/resource_bundle_handler_ctocpp.h | 0 .../ctocpp/resource_handler_ctocpp.cc | 0 .../ctocpp/resource_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/response_ctocpp.cc | 0 .../libcef_dll}/ctocpp/response_ctocpp.h | 0 .../ctocpp/scheme_handler_factory_ctocpp.cc | 0 .../ctocpp/scheme_handler_factory_ctocpp.h | 0 .../ctocpp/scheme_registrar_ctocpp.cc | 0 .../ctocpp/scheme_registrar_ctocpp.h | 0 .../ctocpp/stream_reader_ctocpp.cc | 0 .../libcef_dll}/ctocpp/stream_reader_ctocpp.h | 0 .../ctocpp/stream_writer_ctocpp.cc | 0 .../libcef_dll}/ctocpp/stream_writer_ctocpp.h | 0 .../ctocpp/string_visitor_ctocpp.cc | 0 .../ctocpp/string_visitor_ctocpp.h | 0 .../libcef_dll}/ctocpp/task_ctocpp.cc | 0 .../libcef_dll}/ctocpp/task_ctocpp.h | 0 .../ctocpp/urlrequest_client_ctocpp.cc | 0 .../ctocpp/urlrequest_client_ctocpp.h | 0 .../libcef_dll}/ctocpp/urlrequest_ctocpp.cc | 0 .../libcef_dll}/ctocpp/urlrequest_ctocpp.h | 0 .../libcef_dll}/ctocpp/v8accessor_ctocpp.cc | 0 .../libcef_dll}/ctocpp/v8accessor_ctocpp.h | 0 .../libcef_dll}/ctocpp/v8context_ctocpp.cc | 0 .../libcef_dll}/ctocpp/v8context_ctocpp.h | 0 .../libcef_dll}/ctocpp/v8exception_ctocpp.cc | 0 .../libcef_dll}/ctocpp/v8exception_ctocpp.h | 0 .../libcef_dll}/ctocpp/v8handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/v8handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/v8value_ctocpp.cc | 0 .../libcef_dll}/ctocpp/v8value_ctocpp.h | 0 .../ctocpp/web_plugin_info_ctocpp.cc | 0 .../ctocpp/web_plugin_info_ctocpp.h | 0 .../ctocpp/web_plugin_info_visitor_ctocpp.cc | 0 .../ctocpp/web_plugin_info_visitor_ctocpp.h | 0 .../ctocpp/write_handler_ctocpp.cc | 0 .../libcef_dll}/ctocpp/write_handler_ctocpp.h | 0 .../libcef_dll}/ctocpp/xml_reader_ctocpp.cc | 0 .../libcef_dll}/ctocpp/xml_reader_ctocpp.h | 0 .../libcef_dll}/ctocpp/zip_reader_ctocpp.cc | 0 .../libcef_dll}/ctocpp/zip_reader_ctocpp.h | 0 {libcef_dll => cef/libcef_dll}/libcef_dll.cc | 0 {libcef_dll => cef/libcef_dll}/libcef_dll.rc | 286 +-- {libcef_dll => cef/libcef_dll}/libcef_dll2.cc | 0 {libcef_dll => cef/libcef_dll}/resource.h | 0 .../libcef_dll}/transfer_util.cpp | 0 .../libcef_dll}/transfer_util.h | 0 .../wrapper/cef_byte_read_handler.cc | 0 .../wrapper/cef_stream_resource_handler.cc | 0 .../libcef_dll}/wrapper/cef_xml_object.cc | 0 .../libcef_dll}/wrapper/cef_zip_archive.cc | 0 .../libcef_dll}/wrapper/libcef_dll_wrapper.cc | 0 .../wrapper/libcef_dll_wrapper2.cc | 0 421 files changed, 4860 insertions(+), 161 deletions(-) create mode 100644 atom/atom/cefclient.rc create mode 100644 atom/atom/cefclient_gtk.cpp create mode 100644 atom/atom/cefclient_mac.h create mode 100644 atom/atom/cefclient_mac.mm create mode 100644 atom/atom/cefclient_win.cpp create mode 100644 atom/atom/client_handler.cpp create mode 100644 atom/atom/client_handler.h create mode 100644 atom/atom/client_handler_gtk.cpp create mode 100644 atom/atom/client_handler_mac.mm create mode 100644 atom/atom/client_handler_win.cpp create mode 100644 atom/atom/mac/English.lproj/InfoPlist.strings create mode 100644 atom/atom/mac/English.lproj/MainMenu.xib create mode 100644 atom/atom/mac/atom.icns create mode 100644 atom/atom/mac/helper-info.plist create mode 100644 atom/atom/mac/info.plist create mode 100644 atom/atom/main_mac.mm create mode 100644 atom/atom/process_helper_mac.cpp create mode 100644 atom/atom/res/cefclient.ico create mode 100644 atom/atom/res/small.ico create mode 100644 atom/atom/util.h create mode 100644 cef/cef_paths.gypi create mode 100644 cef/cef_paths2.gypi rename cef_paths.gypi => cef/frameworks/cef_paths.gypi (100%) rename cef_paths2.gypi => cef/frameworks/cef_paths2.gypi (100%) rename cef/{ => frameworks}/ffmpegsumo.so (100%) rename cef/{ => frameworks}/libcef.dylib (100%) rename cef/{ => frameworks}/libcef.dylib.dSYM/Contents/Info.plist (100%) rename cef/{ => frameworks}/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib (100%) rename {include => cef/include}/capi/cef_app_capi.h (100%) rename {include => cef/include}/capi/cef_base_capi.h (100%) rename {include => cef/include}/capi/cef_browser_capi.h (100%) rename {include => cef/include}/capi/cef_browser_process_handler_capi.h (100%) rename {include => cef/include}/capi/cef_callback_capi.h (100%) rename {include => cef/include}/capi/cef_client_capi.h (100%) rename {include => cef/include}/capi/cef_command_line_capi.h (100%) rename {include => cef/include}/capi/cef_context_menu_handler_capi.h (100%) rename {include => cef/include}/capi/cef_cookie_capi.h (100%) rename {include => cef/include}/capi/cef_display_handler_capi.h (100%) rename {include => cef/include}/capi/cef_dom_capi.h (100%) rename {include => cef/include}/capi/cef_download_handler_capi.h (100%) rename {include => cef/include}/capi/cef_download_item_capi.h (100%) rename {include => cef/include}/capi/cef_focus_handler_capi.h (100%) rename {include => cef/include}/capi/cef_frame_capi.h (100%) rename {include => cef/include}/capi/cef_geolocation_handler_capi.h (100%) rename {include => cef/include}/capi/cef_jsdialog_handler_capi.h (100%) rename {include => cef/include}/capi/cef_keyboard_handler_capi.h (100%) rename {include => cef/include}/capi/cef_life_span_handler_capi.h (100%) rename {include => cef/include}/capi/cef_load_handler_capi.h (100%) rename {include => cef/include}/capi/cef_menu_model_capi.h (100%) rename {include => cef/include}/capi/cef_origin_whitelist_capi.h (100%) rename {include => cef/include}/capi/cef_path_util_capi.h (100%) rename {include => cef/include}/capi/cef_process_message_capi.h (100%) rename {include => cef/include}/capi/cef_process_util_capi.h (100%) rename {include => cef/include}/capi/cef_proxy_handler_capi.h (100%) rename {include => cef/include}/capi/cef_render_process_handler_capi.h (100%) rename {include => cef/include}/capi/cef_request_capi.h (100%) rename {include => cef/include}/capi/cef_request_handler_capi.h (100%) rename {include => cef/include}/capi/cef_resource_bundle_handler_capi.h (100%) rename {include => cef/include}/capi/cef_resource_handler_capi.h (100%) rename {include => cef/include}/capi/cef_response_capi.h (100%) rename {include => cef/include}/capi/cef_scheme_capi.h (100%) rename {include => cef/include}/capi/cef_stream_capi.h (100%) rename {include => cef/include}/capi/cef_string_visitor_capi.h (100%) rename {include => cef/include}/capi/cef_task_capi.h (100%) rename {include => cef/include}/capi/cef_url_capi.h (100%) rename {include => cef/include}/capi/cef_urlrequest_capi.h (100%) rename {include => cef/include}/capi/cef_v8_capi.h (100%) rename {include => cef/include}/capi/cef_values_capi.h (100%) rename {include => cef/include}/capi/cef_web_plugin_capi.h (100%) rename {include => cef/include}/capi/cef_xml_reader_capi.h (100%) rename {include => cef/include}/capi/cef_zip_reader_capi.h (100%) rename {include => cef/include}/cef_app.h (100%) rename {include => cef/include}/cef_application_mac.h (100%) rename {include => cef/include}/cef_base.h (100%) rename {include => cef/include}/cef_browser.h (100%) rename {include => cef/include}/cef_browser_process_handler.h (100%) rename {include => cef/include}/cef_callback.h (100%) rename {include => cef/include}/cef_client.h (100%) rename {include => cef/include}/cef_command_line.h (100%) rename {include => cef/include}/cef_context_menu_handler.h (100%) rename {include => cef/include}/cef_cookie.h (100%) rename {include => cef/include}/cef_display_handler.h (100%) rename {include => cef/include}/cef_dom.h (100%) rename {include => cef/include}/cef_download_handler.h (100%) rename {include => cef/include}/cef_download_item.h (100%) rename {include => cef/include}/cef_focus_handler.h (100%) rename {include => cef/include}/cef_frame.h (100%) rename {include => cef/include}/cef_geolocation_handler.h (100%) rename {include => cef/include}/cef_jsdialog_handler.h (100%) rename {include => cef/include}/cef_keyboard_handler.h (100%) rename {include => cef/include}/cef_life_span_handler.h (100%) rename {include => cef/include}/cef_load_handler.h (100%) rename {include => cef/include}/cef_menu_model.h (100%) rename {include => cef/include}/cef_origin_whitelist.h (100%) rename {include => cef/include}/cef_pack_resources.h (100%) rename {include => cef/include}/cef_pack_strings.h (100%) rename {include => cef/include}/cef_path_util.h (100%) rename {include => cef/include}/cef_process_message.h (100%) rename {include => cef/include}/cef_process_util.h (100%) rename {include => cef/include}/cef_proxy_handler.h (100%) rename {include => cef/include}/cef_render_process_handler.h (100%) rename {include => cef/include}/cef_request.h (100%) rename {include => cef/include}/cef_request_handler.h (100%) rename {include => cef/include}/cef_resource_bundle_handler.h (100%) rename {include => cef/include}/cef_resource_handler.h (100%) rename {include => cef/include}/cef_response.h (100%) rename {include => cef/include}/cef_runnable.h (100%) rename {include => cef/include}/cef_scheme.h (100%) rename {include => cef/include}/cef_stream.h (100%) rename {include => cef/include}/cef_string_visitor.h (100%) rename {include => cef/include}/cef_task.h (100%) rename {include => cef/include}/cef_url.h (100%) rename {include => cef/include}/cef_urlrequest.h (100%) rename {include => cef/include}/cef_v8.h (100%) rename {include => cef/include}/cef_values.h (100%) rename {include => cef/include}/cef_version.h (100%) rename {include => cef/include}/cef_web_plugin.h (100%) rename {include => cef/include}/cef_xml_reader.h (100%) rename {include => cef/include}/cef_zip_reader.h (100%) rename {include => cef/include}/internal/cef_build.h (100%) rename {include => cef/include}/internal/cef_export.h (100%) rename {include => cef/include}/internal/cef_linux.h (100%) rename {include => cef/include}/internal/cef_mac.h (100%) rename {include => cef/include}/internal/cef_ptr.h (100%) rename {include => cef/include}/internal/cef_string.h (100%) rename {include => cef/include}/internal/cef_string_list.h (100%) rename {include => cef/include}/internal/cef_string_map.h (100%) rename {include => cef/include}/internal/cef_string_multimap.h (100%) rename {include => cef/include}/internal/cef_string_types.h (100%) rename {include => cef/include}/internal/cef_string_wrappers.h (100%) rename {include => cef/include}/internal/cef_time.h (100%) rename {include => cef/include}/internal/cef_tuple.h (100%) rename {include => cef/include}/internal/cef_types.h (100%) rename {include => cef/include}/internal/cef_types_linux.h (100%) rename {include => cef/include}/internal/cef_types_mac.h (100%) rename {include => cef/include}/internal/cef_types_win.h (100%) rename {include => cef/include}/internal/cef_types_wrappers.h (100%) rename {include => cef/include}/internal/cef_win.h (100%) rename {include => cef/include}/wrapper/cef_byte_read_handler.h (100%) rename {include => cef/include}/wrapper/cef_stream_resource_handler.h (100%) rename {include => cef/include}/wrapper/cef_xml_object.h (100%) rename {include => cef/include}/wrapper/cef_zip_archive.h (100%) rename {libcef_dll => cef/libcef_dll}/cef_logging.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/app_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/app_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/auth_callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/auth_callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/base_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/before_download_callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/before_download_callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/binary_value_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/binary_value_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_host_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_host_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_process_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/browser_process_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/client_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/client_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/command_line_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/command_line_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/context_menu_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/context_menu_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/context_menu_params_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/context_menu_params_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/cookie_manager_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/cookie_manager_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/cookie_visitor_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/cookie_visitor_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/dictionary_value_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/dictionary_value_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/display_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/display_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domdocument_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domdocument_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domevent_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domevent_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domevent_listener_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domevent_listener_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domnode_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domnode_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domvisitor_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/domvisitor_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_item_callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_item_callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_item_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/download_item_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/focus_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/focus_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/frame_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/frame_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/geolocation_callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/geolocation_callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/geolocation_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/geolocation_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/jsdialog_callback_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/jsdialog_callback_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/jsdialog_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/jsdialog_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/keyboard_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/keyboard_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/life_span_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/life_span_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/list_value_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/list_value_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/load_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/load_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/menu_model_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/menu_model_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/permission_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/permission_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/post_data_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/post_data_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/post_data_element_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/post_data_element_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/process_message_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/process_message_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/proxy_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/proxy_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/read_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/read_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/render_process_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/render_process_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/request_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/request_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/request_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/request_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/resource_bundle_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/resource_bundle_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/resource_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/resource_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/response_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/response_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/scheme_handler_factory_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/scheme_handler_factory_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/scheme_registrar_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/scheme_registrar_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/stream_reader_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/stream_reader_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/stream_writer_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/stream_writer_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/string_visitor_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/string_visitor_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/task_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/task_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/urlrequest_client_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/urlrequest_client_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/urlrequest_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/urlrequest_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8accessor_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8accessor_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8context_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8context_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8exception_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8exception_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8value_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/v8value_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/web_plugin_info_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/web_plugin_info_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/web_plugin_info_visitor_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/web_plugin_info_visitor_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/write_handler_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/write_handler_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/xml_reader_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/xml_reader_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/zip_reader_cpptoc.cc (100%) rename {libcef_dll => cef/libcef_dll}/cpptoc/zip_reader_cpptoc.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/app_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/app_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/auth_callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/auth_callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/base_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/before_download_callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/before_download_callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/binary_value_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/binary_value_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_host_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_host_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_process_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/browser_process_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/client_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/client_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/command_line_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/command_line_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/context_menu_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/context_menu_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/context_menu_params_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/context_menu_params_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/cookie_manager_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/cookie_manager_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/cookie_visitor_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/cookie_visitor_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/dictionary_value_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/dictionary_value_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/display_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/display_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domdocument_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domdocument_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domevent_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domevent_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domevent_listener_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domevent_listener_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domnode_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domnode_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domvisitor_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/domvisitor_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_item_callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_item_callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_item_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/download_item_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/focus_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/focus_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/frame_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/frame_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/geolocation_callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/geolocation_callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/geolocation_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/geolocation_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/jsdialog_callback_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/jsdialog_callback_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/jsdialog_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/jsdialog_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/keyboard_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/keyboard_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/life_span_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/life_span_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/list_value_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/list_value_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/load_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/load_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/menu_model_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/menu_model_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/permission_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/permission_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/post_data_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/post_data_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/post_data_element_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/post_data_element_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/process_message_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/process_message_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/proxy_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/proxy_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/read_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/read_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/render_process_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/render_process_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/request_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/request_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/request_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/request_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/resource_bundle_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/resource_bundle_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/resource_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/resource_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/response_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/response_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/scheme_handler_factory_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/scheme_handler_factory_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/scheme_registrar_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/scheme_registrar_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/stream_reader_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/stream_reader_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/stream_writer_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/stream_writer_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/string_visitor_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/string_visitor_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/task_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/task_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/urlrequest_client_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/urlrequest_client_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/urlrequest_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/urlrequest_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8accessor_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8accessor_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8context_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8context_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8exception_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8exception_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8value_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/v8value_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/web_plugin_info_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/web_plugin_info_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/web_plugin_info_visitor_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/web_plugin_info_visitor_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/write_handler_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/write_handler_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/xml_reader_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/xml_reader_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/zip_reader_ctocpp.cc (100%) rename {libcef_dll => cef/libcef_dll}/ctocpp/zip_reader_ctocpp.h (100%) rename {libcef_dll => cef/libcef_dll}/libcef_dll.cc (100%) rename {libcef_dll => cef/libcef_dll}/libcef_dll.rc (96%) rename {libcef_dll => cef/libcef_dll}/libcef_dll2.cc (100%) rename {libcef_dll => cef/libcef_dll}/resource.h (100%) rename {libcef_dll => cef/libcef_dll}/transfer_util.cpp (100%) rename {libcef_dll => cef/libcef_dll}/transfer_util.h (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/cef_byte_read_handler.cc (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/cef_stream_resource_handler.cc (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/cef_xml_object.cc (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/cef_zip_archive.cc (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/libcef_dll_wrapper.cc (100%) rename {libcef_dll => cef/libcef_dll}/wrapper/libcef_dll_wrapper2.cc (100%) diff --git a/atom.gyp b/atom.gyp index c04aa245c..1331e1813 100644 --- a/atom.gyp +++ b/atom.gyp @@ -18,7 +18,7 @@ ], }, 'includes': [ - 'cef_paths2.gypi', + 'cef/cef_paths2.gypi', ], 'target_defaults': { 'xcode_settings': { @@ -40,7 +40,7 @@ 'defines': [ 'USING_CEF_SHARED', ], - 'include_dirs': [ '.' ], + 'include_dirs': [ '.', 'cef' ], 'sources': [ '<@(includes_common)', '<@(includes_wrapper)', @@ -111,19 +111,21 @@ # Add library dependencies to the bundle. 'destination': '<(PRODUCT_DIR)/Atom.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/', 'files': [ - 'cef/libcef.dylib', - 'cef/ffmpegsumo.so', - ], - }, - { - # Add the helper app. - 'destination': '<(PRODUCT_DIR)/Atom.app/Contents/Frameworks', - 'files': [ - '<(PRODUCT_DIR)/Atom Helper.app', + 'cef/frameworks/libcef.dylib', + 'cef/frameworks/ffmpegsumo.so', ], }, ], 'postbuilds': [ + { + 'postbuild_name': 'Copy Helper App', + 'action': [ + 'cp', + '-r', + '${BUILT_PRODUCTS_DIR}/Atom Helper.app', + '${BUILT_PRODUCTS_DIR}/Atom.app/Contents/Frameworks', + ], + }, { 'postbuild_name': 'Fix Framework Link', 'action': [ @@ -139,7 +141,7 @@ 'action': [ 'cp', '-r', - 'cef/Resources', + 'cef/resources', '${BUILT_PRODUCTS_DIR}/Atom.app/Contents/Frameworks/Chromium Embedded Framework.framework/' ], }, @@ -170,9 +172,9 @@ 'atom/cefclient_mac.h', 'atom/cefclient_mac.mm', 'atom/client_handler_mac.mm', - 'include/cef_application_mac.h', - 'include/internal/cef_mac.h', - 'include/internal/cef_types_mac.h', + 'cef/include/cef_application_mac.h', + 'cef/include/internal/cef_mac.h', + 'cef/include/internal/cef_types_mac.h', ], }], [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { @@ -199,7 +201,7 @@ 'defines': [ 'USING_CEF_SHARED', ], - 'include_dirs': [ '.' ], + 'include_dirs': [ '.', 'cef' ], 'sources': [ '<@(includes_common)', '<@(includes_capi)', @@ -208,7 +210,7 @@ ], 'link_settings': { 'libraries': [ - 'cef/libcef.dylib', + 'cef/frameworks/libcef.dylib', ], } }, @@ -236,7 +238,7 @@ 'USING_CEF_SHARED', 'PROCESS_HELPER_APP', ], - 'include_dirs': [ '.' ], + 'include_dirs': [ '.', 'cef' ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', diff --git a/atom/atom/cefclient.rc b/atom/atom/cefclient.rc new file mode 100644 index 000000000..14b3f9491 --- /dev/null +++ b/atom/atom/cefclient.rc @@ -0,0 +1,172 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Binary +// + +IDS_BINDING BINARY "res\\binding.html" +IDS_DIALOGS BINARY "res\\dialogs.html" +IDS_LOGO BINARY "res\\logo.png" +IDS_LOGOBALL BINARY "res\\logoball.png" +IDS_LOCALSTORAGE BINARY "res\\localstorage.html" +IDS_XMLHTTPREQUEST BINARY "res\\xmlhttprequest.html" +IDS_DOMACCESS BINARY "res\\domaccess.html" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_CEFCLIENT ICON "res\cefclient.ico" +IDI_SMALL ICON "res\small.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_CEFCLIENT MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDM_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "&About ...", IDM_ABOUT + END + POPUP "Tests" + BEGIN + MENUITEM "Get Source", ID_TESTS_GETSOURCE + MENUITEM "Get Text", ID_TESTS_GETTEXT + MENUITEM "Popup Window", ID_TESTS_POPUP + MENUITEM "Request", ID_TESTS_REQUEST + MENUITEM "Scheme Handler", ID_TESTS_SCHEME_HANDLER + MENUITEM "JavaScript Binding", ID_TESTS_BINDING + MENUITEM "JavaScript Dialogs", ID_TESTS_DIALOGS + MENUITEM "Plugin Info", ID_TESTS_PLUGIN_INFO + MENUITEM "DOM Access", ID_TESTS_DOM_ACCESS + MENUITEM "Local Storage", ID_TESTS_LOCALSTORAGE + MENUITEM "XMLHttpRequest", ID_TESTS_XMLHTTPREQUEST + MENUITEM "Accelerated 2D Canvas", ID_TESTS_ACCELERATED2DCANVAS + MENUITEM "Accelerated Layers", ID_TESTS_ACCELERATEDLAYERS + MENUITEM "WebGL", ID_TESTS_WEBGL + MENUITEM "HTML5 Video", ID_TESTS_HTML5VIDEO + MENUITEM "Drag && Drop", ID_TESTS_DRAGDROP + MENUITEM "Geolocation", ID_TESTS_GEOLOCATION + MENUITEM "Zoom In", ID_TESTS_ZOOM_IN + MENUITEM "Zoom Out", ID_TESTS_ZOOM_OUT + MENUITEM "Zoom Reset", ID_TESTS_ZOOM_RESET + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_CEFCLIENT ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG 22, 17, 230, 75 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "System" +BEGIN + ICON IDI_CEFCLIENT,IDC_MYICON,14,9,16,16 + LTEXT "cefclient Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2008",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_APP_TITLE "cefclient" + IDC_CEFCLIENT "CEFCLIENT" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/atom/atom/cefclient_gtk.cpp b/atom/atom/cefclient_gtk.cpp new file mode 100644 index 000000000..118862711 --- /dev/null +++ b/atom/atom/cefclient_gtk.cpp @@ -0,0 +1,408 @@ +// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include +#include +#include +#include +#include "cefclient/cefclient.h" +#include "include/cef_app.h" +#include "include/cef_browser.h" +#include "include/cef_frame.h" +#include "include/cef_runnable.h" +#include "cefclient/binding_test.h" +#include "cefclient/client_handler.h" +#include "cefclient/dom_test.h" +#include "cefclient/scheme_test.h" +#include "cefclient/string_util.h" + +char szWorkingDir[512]; // The current working directory + +// The global ClientHandler reference. +extern CefRefPtr g_handler; + +void destroy(void) { + CefQuitMessageLoop(); +} + +void TerminationSignalHandler(int signatl) { + destroy(); +} + +// Callback for Debug > Get Source... menu item. +gboolean GetSourceActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunGetSourceTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Get Source... menu item. +gboolean GetTextActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunGetTextTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Request... menu item. +gboolean RequestActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunRequestTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Local Storage... menu item. +gboolean LocalStorageActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunLocalStorageTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > XMLHttpRequest... menu item. +gboolean XMLHttpRequestActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunXMLHTTPRequestTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Scheme Handler... menu item. +gboolean SchemeHandlerActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + scheme_test::RunTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > JavaScript Binding... menu item. +gboolean BindingActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + binding_test::RunTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Plugin Info... menu item. +gboolean PluginInfoActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunPluginInfoTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > DOM Access... menu item. +gboolean DOMAccessActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + dom_test::RunTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Popup Window... menu item. +gboolean PopupWindowActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunPopupTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Accelerated 2D Canvas... menu item. +gboolean Accelerated2DCanvasActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunAccelerated2DCanvasTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Accelerated Layers... menu item. +gboolean AcceleratedLayersActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunAcceleratedLayersTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > WebGL... menu item. +gboolean WebGLActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunWebGLTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > HTML5 Video... menu item. +gboolean HTML5VideoActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunHTML5VideoTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > HTML5 Drag & Drop... menu item. +gboolean HTML5DragDropActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) + RunDragDropTest(g_handler->GetBrowser()); + + return FALSE; // Don't stop this message. +} + + +// Callback for Debug > Zoom In... menu item. +gboolean ZoomInActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) { + CefRefPtr browser = g_handler->GetBrowser(); + browser->GetHost()->SetZoomLevel(browser->GetHost()->GetZoomLevel() + 0.5); + } + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Zoom Out... menu item. +gboolean ZoomOutActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) { + CefRefPtr browser = g_handler->GetBrowser(); + browser->GetHost()->SetZoomLevel(browser->GetHost()->GetZoomLevel() - 0.5); + } + + return FALSE; // Don't stop this message. +} + +// Callback for Debug > Zoom Reset... menu item. +gboolean ZoomResetActivated(GtkWidget* widget) { + if (g_handler.get() && g_handler->GetBrowserId()) { + CefRefPtr browser = g_handler->GetBrowser(); + browser->GetHost()->SetZoomLevel(0.0); + } + + return FALSE; // Don't stop this message. +} + +// Callback for when you click the back button. +void BackButtonClicked(GtkButton* button) { + if (g_handler.get() && g_handler->GetBrowserId()) + g_handler->GetBrowser()->GoBack(); +} + +// Callback for when you click the forward button. +void ForwardButtonClicked(GtkButton* button) { + if (g_handler.get() && g_handler->GetBrowserId()) + g_handler->GetBrowser()->GoForward(); +} + +// Callback for when you click the stop button. +void StopButtonClicked(GtkButton* button) { + if (g_handler.get() && g_handler->GetBrowserId()) + g_handler->GetBrowser()->StopLoad(); +} + +// Callback for when you click the reload button. +void ReloadButtonClicked(GtkButton* button) { + if (g_handler.get() && g_handler->GetBrowserId()) + g_handler->GetBrowser()->Reload(); +} + +// Callback for when you press enter in the URL box. +void URLEntryActivate(GtkEntry* entry) { + if (!g_handler.get() || !g_handler->GetBrowserId()) + return; + + const gchar* url = gtk_entry_get_text(entry); + g_handler->GetBrowser()->GetMainFrame()->LoadURL(std::string(url).c_str()); +} + +// GTK utility functions ---------------------------------------------- + +GtkWidget* AddMenuEntry(GtkWidget* menu_widget, const char* text, + GCallback callback) { + GtkWidget* entry = gtk_menu_item_new_with_label(text); + g_signal_connect(entry, "activate", callback, NULL); + gtk_menu_shell_append(GTK_MENU_SHELL(menu_widget), entry); + return entry; +} + +GtkWidget* CreateMenu(GtkWidget* menu_bar, const char* text) { + GtkWidget* menu_widget = gtk_menu_new(); + GtkWidget* menu_header = gtk_menu_item_new_with_label(text); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_header), menu_widget); + gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_header); + return menu_widget; +} + +GtkWidget* CreateMenuBar() { + GtkWidget* menu_bar = gtk_menu_bar_new(); + GtkWidget* debug_menu = CreateMenu(menu_bar, "Tests"); + + AddMenuEntry(debug_menu, "Get Source", + G_CALLBACK(GetSourceActivated)); + AddMenuEntry(debug_menu, "Get Text", + G_CALLBACK(GetTextActivated)); + AddMenuEntry(debug_menu, "Request", + G_CALLBACK(RequestActivated)); + AddMenuEntry(debug_menu, "Local Storage", + G_CALLBACK(LocalStorageActivated)); + AddMenuEntry(debug_menu, "XMLHttpRequest", + G_CALLBACK(XMLHttpRequestActivated)); + AddMenuEntry(debug_menu, "Scheme Handler", + G_CALLBACK(SchemeHandlerActivated)); + AddMenuEntry(debug_menu, "JavaScript Binding", + G_CALLBACK(BindingActivated)); + AddMenuEntry(debug_menu, "Plugin Info", + G_CALLBACK(PluginInfoActivated)); + AddMenuEntry(debug_menu, "DOM Access", + G_CALLBACK(DOMAccessActivated)); + AddMenuEntry(debug_menu, "Popup Window", + G_CALLBACK(PopupWindowActivated)); + AddMenuEntry(debug_menu, "Accelerated 2D Canvas", + G_CALLBACK(Accelerated2DCanvasActivated)); + AddMenuEntry(debug_menu, "Accelerated Layers", + G_CALLBACK(AcceleratedLayersActivated)); + AddMenuEntry(debug_menu, "WebGL", + G_CALLBACK(WebGLActivated)); + AddMenuEntry(debug_menu, "HTML5 Video", + G_CALLBACK(HTML5VideoActivated)); + AddMenuEntry(debug_menu, "HTML5 Drag & Drop", + G_CALLBACK(HTML5DragDropActivated)); + AddMenuEntry(debug_menu, "Zoom In", + G_CALLBACK(ZoomInActivated)); + AddMenuEntry(debug_menu, "Zoom Out", + G_CALLBACK(ZoomOutActivated)); + AddMenuEntry(debug_menu, "Zoom Reset", + G_CALLBACK(ZoomResetActivated)); + return menu_bar; +} + +// WebViewDelegate::TakeFocus in the test webview delegate. +static gboolean HandleFocus(GtkWidget* widget, + GdkEventFocus* focus) { + if (g_handler.get() && g_handler->GetBrowserId()) { + // Give focus to the browser window. + g_handler->GetBrowser()->GetHost()->SetFocus(true); + } + + return TRUE; +} + +int main(int argc, char* argv[]) { + CefMainArgs main_args(argc, argv); + CefRefPtr app(new ClientApp); + + // Execute the secondary process, if any. + int exit_code = CefExecuteProcess(main_args, app.get()); + if (exit_code >= 0) + return exit_code; + + if (!getcwd(szWorkingDir, sizeof (szWorkingDir))) + return -1; + + GtkWidget* window; + + gtk_init(&argc, &argv); + + // Parse command line arguments. + AppInitCommandLine(argc, argv); + + CefSettings settings; + + // Populate the settings based on command line arguments. + AppGetSettings(settings, app); + + // Initialize CEF. + CefInitialize(main_args, settings, app.get()); + + // Register the scheme handler. + scheme_test::InitTest(); + + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_default_size(GTK_WINDOW(window), 800, 600); + + g_signal_connect(window, "focus", G_CALLBACK(&HandleFocus), NULL); + + GtkWidget* vbox = gtk_vbox_new(FALSE, 0); + + GtkWidget* menu_bar = CreateMenuBar(); + + gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 0); + + GtkWidget* toolbar = gtk_toolbar_new(); + // Turn off the labels on the toolbar buttons. + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + + GtkToolItem* back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); + g_signal_connect(back, "clicked", + G_CALLBACK(BackButtonClicked), NULL); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), back, -1 /* append */); + + GtkToolItem* forward = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); + g_signal_connect(forward, "clicked", + G_CALLBACK(ForwardButtonClicked), NULL); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), forward, -1 /* append */); + + GtkToolItem* reload = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); + g_signal_connect(reload, "clicked", + G_CALLBACK(ReloadButtonClicked), NULL); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), reload, -1 /* append */); + + GtkToolItem* stop = gtk_tool_button_new_from_stock(GTK_STOCK_STOP); + g_signal_connect(stop, "clicked", + G_CALLBACK(StopButtonClicked), NULL); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), stop, -1 /* append */); + + GtkWidget* m_editWnd = gtk_entry_new(); + g_signal_connect(G_OBJECT(m_editWnd), "activate", + G_CALLBACK(URLEntryActivate), NULL); + + GtkToolItem* tool_item = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(tool_item), m_editWnd); + gtk_tool_item_set_expand(tool_item, TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_item, -1); // append + + gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); + + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(gtk_widget_destroyed), &window); + g_signal_connect(G_OBJECT(window), "destroy", + G_CALLBACK(destroy), NULL); + + // Create the handler. + g_handler = new ClientHandler(); + g_handler->SetMainHwnd(vbox); + g_handler->SetEditHwnd(m_editWnd); + g_handler->SetButtonHwnds(GTK_WIDGET(back), GTK_WIDGET(forward), + GTK_WIDGET(reload), GTK_WIDGET(stop)); + + // Create the browser view. + CefWindowInfo window_info; + CefBrowserSettings browserSettings; + + // Populate the settings based on command line arguments. + AppGetBrowserSettings(browserSettings); + + window_info.SetAsChild(vbox); + + CefBrowserHost::CreateBrowserSync( + window_info, g_handler.get(), + g_handler->GetStartupURL(), browserSettings); + + gtk_container_add(GTK_CONTAINER(window), vbox); + gtk_widget_show_all(GTK_WIDGET(window)); + + // Install an signal handler so we clean up after ourselves. + signal(SIGINT, TerminationSignalHandler); + signal(SIGTERM, TerminationSignalHandler); + + CefRunMessageLoop(); + + CefShutdown(); + + return 0; +} + +// Global functions + +std::string AppGetWorkingDirectory() { + return szWorkingDir; +} diff --git a/atom/atom/cefclient_mac.h b/atom/atom/cefclient_mac.h new file mode 100644 index 000000000..a70b06856 --- /dev/null +++ b/atom/atom/cefclient_mac.h @@ -0,0 +1,12 @@ +#include "include/cef_app.h" + +@interface ClientApplication : NSApplication { +@private + BOOL handlingSendEvent_; +} + ++ (void)populateAppSettings:(CefSettings &)settings; +- (void)createWindow; +- (void)populateBrowserSettings:(CefBrowserSettings &)settings; + +@end \ No newline at end of file diff --git a/atom/atom/cefclient_mac.mm b/atom/atom/cefclient_mac.mm new file mode 100644 index 000000000..14a3cfb59 --- /dev/null +++ b/atom/atom/cefclient_mac.mm @@ -0,0 +1,152 @@ +#import "include/cef_application_mac.h" +#import "atom/client_handler.h" +#import "atom/cefclient_mac.h" + +// The global ClientHandler reference. +extern CefRefPtr g_handler; + +@implementation ClientApplication + ++ (id)sharedApplication { + id atomApp = [super sharedApplication]; + + CefSettings settings; + [self populateAppSettings:settings]; + + CefMainArgs mainArgs(0, NULL); + CefRefPtr app; + + CefInitialize(mainArgs, settings, app.get()); + + return atomApp; +} + ++ (void)populateAppSettings:(CefSettings &)settings { + CefString(&settings.cache_path) = ""; + CefString(&settings.user_agent) = ""; + CefString(&settings.log_file) = ""; + CefString(&settings.javascript_flags) = ""; + + settings.log_severity = LOGSEVERITY_ERROR; +} + + +// Create the application on the UI thread. +- (void)createWindow { + // Create the main application window. + NSRect window_rect = { {0, 0}, {800, 800} }; + NSWindow* mainWnd = [[UnderlayOpenGLHostingWindow alloc] + initWithContentRect:window_rect + styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask ) + backing:NSBackingStoreBuffered + defer:NO]; + [mainWnd setTitle:@"cefclient"]; + [mainWnd setDelegate:self]; + + // Rely on the window delegate to clean us up rather than immediately + // releasing when the window gets closed. We use the delegate to do + // everything from the autorelease pool so the window isn't on the stack + // during cleanup (ie, a window close from javascript). + [mainWnd setReleasedWhenClosed:NO]; + + NSView* contentView = [mainWnd contentView]; + + // Create the handler. + g_handler = new ClientHandler(); + g_handler->SetMainHwnd(contentView); + + // Create the browser view. + CefWindowInfo window_info; + CefBrowserSettings settings; + + [self populateBrowserSettings:settings]; + + window_info.SetAsChild(contentView, window_rect.origin.x, window_rect.origin.y, window_rect.size.width, window_rect.size.height); + CefBrowserHost::CreateBrowser(window_info, g_handler.get(), g_handler->GetStartupURL(), settings); + + [mainWnd makeKeyAndOrderFront:nil]; +} + +- (void)populateBrowserSettings:(CefBrowserSettings &)settings { + CefString(&settings.default_encoding) = "UTF-8"; + settings.remote_fonts_disabled = true; + settings.encoding_detector_enabled = false; + settings.javascript_disabled = false; + settings.javascript_open_windows_disallowed = true; + settings.javascript_close_windows_disallowed = false; + settings.javascript_access_clipboard_disallowed = false; + settings.dom_paste_disabled = true; + settings.caret_browsing_enabled = false; + settings.java_disabled = true; + settings.plugins_disabled = true; + settings.universal_access_from_file_urls_allowed = false; + settings.file_access_from_file_urls_allowed = false; + settings.web_security_disabled = false; + settings.xss_auditor_enabled = true; + settings.image_load_disabled = false; + settings.shrink_standalone_images_to_fit = false; + settings.site_specific_quirks_disabled = false; + settings.text_area_resize_disabled = false; + settings.page_cache_disabled = true; + settings.tab_to_links_disabled = true; + settings.hyperlink_auditing_disabled = true; + settings.user_style_sheet_enabled = false; + settings.author_and_user_styles_disabled = false; + settings.local_storage_disabled = false; + settings.databases_disabled = false; + settings.application_cache_disabled = false; + settings.webgl_disabled = false; + settings.accelerated_compositing_disabled = false; + settings.accelerated_layers_disabled = false; + settings.accelerated_video_disabled = false; + settings.accelerated_2d_canvas_disabled = false; + settings.accelerated_painting_enabled = true; + settings.accelerated_filters_enabled = true; + settings.accelerated_plugins_disabled = false; + settings.developer_tools_disabled = false; + settings.fullscreen_enabled = true; +} + +# pragma mark NSApplicationDelegate + +// Sent by the default notification center immediately before the application terminates. +- (void)applicationWillTerminate:(NSNotification *)notification { + g_handler = NULL; // Shut down CEF. + CefShutdown(); + [self release]; +} + +# pragma mark CefAppProtocol + +- (BOOL)isHandlingSendEvent { + return handlingSendEvent_; +} + +- (void)setHandlingSendEvent:(BOOL)handlingSendEvent { + handlingSendEvent_ = handlingSendEvent; +} + +- (void)sendEvent:(NSEvent*)event { + CefScopedSendingEvent sendingEventScoper; + [super sendEvent:event]; +} + +# pragma mark NSWindowDelegate + +- (void)windowDidBecomeKey:(NSNotification*)notification { + if (g_handler.get() && g_handler->GetBrowserId()) { + g_handler->GetBrowser()->GetHost()->SetFocus(true); + } +} + +// Clean ourselves up after clearing the stack of anything that might have the window on it. +- (BOOL)windowShouldClose:(id)window { + [window autorelease]; + + return YES; +} + +@end + + + diff --git a/atom/atom/cefclient_win.cpp b/atom/atom/cefclient_win.cpp new file mode 100644 index 000000000..a380d9ce2 --- /dev/null +++ b/atom/atom/cefclient_win.cpp @@ -0,0 +1,546 @@ +// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include "cefclient/cefclient.h" +#include +#include +#include +#include +#include +#include +#include "include/cef_app.h" +#include "include/cef_browser.h" +#include "include/cef_frame.h" +#include "include/cef_runnable.h" +#include "cefclient/binding_test.h" +#include "cefclient/client_handler.h" +#include "cefclient/dom_test.h" +#include "cefclient/resource.h" +#include "cefclient/scheme_test.h" +#include "cefclient/string_util.h" + +#define MAX_LOADSTRING 100 +#define MAX_URL_LENGTH 255 +#define BUTTON_WIDTH 72 +#define URLBAR_HEIGHT 24 + +// Global Variables: +HINSTANCE hInst; // current instance +TCHAR szTitle[MAX_LOADSTRING]; // The title bar text +TCHAR szWindowClass[MAX_LOADSTRING]; // the main window class name +char szWorkingDir[MAX_PATH]; // The current working directory + +// Forward declarations of functions included in this code module: +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); + +// The global ClientHandler reference. +extern CefRefPtr g_handler; + +#if defined(OS_WIN) +// Add Common Controls to the application manifest because it's required to +// support the default tooltip implementation. +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") // NOLINT(whitespace/line_length) +#endif + +// Program entry point function. +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) { + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + CefMainArgs main_args(hInstance); + CefRefPtr app(new ClientApp); + + // Execute the secondary process, if any. + int exit_code = CefExecuteProcess(main_args, app.get()); + if (exit_code >= 0) + return exit_code; + + // Retrieve the current working directory. + if (_getcwd(szWorkingDir, MAX_PATH) == NULL) + szWorkingDir[0] = 0; + + // Parse command line arguments. The passed in values are ignored on Windows. + AppInitCommandLine(0, NULL); + + CefSettings settings; + + // Populate the settings based on command line arguments. + AppGetSettings(settings, app); + + // Initialize CEF. + CefInitialize(main_args, settings, app.get()); + + // Register the scheme handler. + scheme_test::InitTest(); + + HACCEL hAccelTable; + + // Initialize global strings + LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + LoadString(hInstance, IDC_CEFCLIENT, szWindowClass, MAX_LOADSTRING); + MyRegisterClass(hInstance); + + // Perform application initialization + if (!InitInstance (hInstance, nCmdShow)) + return FALSE; + + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_CEFCLIENT)); + + int result = 0; + + if (!settings.multi_threaded_message_loop) { + // Run the CEF message loop. This function will block until the application + // recieves a WM_QUIT message. + CefRunMessageLoop(); + } else { + MSG msg; + + // Run the application message loop. + while (GetMessage(&msg, NULL, 0, 0)) { + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + result = static_cast(msg.wParam); + } + + // Shut down CEF. + CefShutdown(); + + return result; +} + +// +// FUNCTION: MyRegisterClass() +// +// PURPOSE: Registers the window class. +// +// COMMENTS: +// +// This function and its usage are only necessary if you want this code +// to be compatible with Win32 systems prior to the 'RegisterClassEx' +// function that was added to Windows 95. It is important to call this +// function so that the application will get 'well formed' small icons +// associated with it. +// +ATOM MyRegisterClass(HINSTANCE hInstance) { + WNDCLASSEX wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_CEFCLIENT)); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = MAKEINTRESOURCE(IDC_CEFCLIENT); + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); + + return RegisterClassEx(&wcex); +} + +// +// FUNCTION: InitInstance(HINSTANCE, int) +// +// PURPOSE: Saves instance handle and creates main window +// +// COMMENTS: +// +// In this function, we save the instance handle in a global variable and +// create and display the main program window. +// +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { + HWND hWnd; + + hInst = hInstance; // Store instance handle in our global variable + + hWnd = CreateWindow(szWindowClass, szTitle, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, 0, + CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL); + + if (!hWnd) + return FALSE; + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + return TRUE; +} + +// Change the zoom factor on the UI thread. +static void ModifyZoom(CefRefPtr browser, double delta) { + if (CefCurrentlyOn(TID_UI)) { + browser->GetHost()->SetZoomLevel( + browser->GetHost()->GetZoomLevel() + delta); + } else { + CefPostTask(TID_UI, NewCefRunnableFunction(ModifyZoom, browser, delta)); + } +} + +// +// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) +// +// PURPOSE: Processes messages for the main window. +// +LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, + LPARAM lParam) { + static HWND backWnd = NULL, forwardWnd = NULL, reloadWnd = NULL, + stopWnd = NULL, editWnd = NULL; + static WNDPROC editWndOldProc = NULL; + + // Static members used for the find dialog. + static FINDREPLACE fr; + static WCHAR szFindWhat[80] = {0}; + static WCHAR szLastFindWhat[80] = {0}; + static bool findNext = false; + static bool lastMatchCase = false; + + int wmId, wmEvent; + PAINTSTRUCT ps; + HDC hdc; + + if (hWnd == editWnd) { + // Callback for the edit window + switch (message) { + case WM_CHAR: + if (wParam == VK_RETURN && g_handler.get()) { + // When the user hits the enter key load the URL + CefRefPtr browser = g_handler->GetBrowser(); + wchar_t strPtr[MAX_URL_LENGTH+1] = {0}; + *((LPWORD)strPtr) = MAX_URL_LENGTH; + LRESULT strLen = SendMessage(hWnd, EM_GETLINE, 0, (LPARAM)strPtr); + if (strLen > 0) { + strPtr[strLen] = 0; + browser->GetMainFrame()->LoadURL(strPtr); + } + + return 0; + } + } + + return (LRESULT)CallWindowProc(editWndOldProc, hWnd, message, wParam, + lParam); + } else { + // Callback for the main window + switch (message) { + case WM_CREATE: { + // Create the single static handler class instance + g_handler = new ClientHandler(); + g_handler->SetMainHwnd(hWnd); + + // Create the child windows used for navigation + RECT rect; + int x = 0; + + GetClientRect(hWnd, &rect); + + backWnd = CreateWindow(L"BUTTON", L"Back", + WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON + | WS_DISABLED, x, 0, BUTTON_WIDTH, URLBAR_HEIGHT, + hWnd, (HMENU) IDC_NAV_BACK, hInst, 0); + x += BUTTON_WIDTH; + + forwardWnd = CreateWindow(L"BUTTON", L"Forward", + WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON + | WS_DISABLED, x, 0, BUTTON_WIDTH, + URLBAR_HEIGHT, hWnd, (HMENU) IDC_NAV_FORWARD, + hInst, 0); + x += BUTTON_WIDTH; + + reloadWnd = CreateWindow(L"BUTTON", L"Reload", + WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON + | WS_DISABLED, x, 0, BUTTON_WIDTH, + URLBAR_HEIGHT, hWnd, (HMENU) IDC_NAV_RELOAD, + hInst, 0); + x += BUTTON_WIDTH; + + stopWnd = CreateWindow(L"BUTTON", L"Stop", + WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON + | WS_DISABLED, x, 0, BUTTON_WIDTH, URLBAR_HEIGHT, + hWnd, (HMENU) IDC_NAV_STOP, hInst, 0); + x += BUTTON_WIDTH; + + editWnd = CreateWindow(L"EDIT", 0, + WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT | + ES_AUTOVSCROLL | ES_AUTOHSCROLL| WS_DISABLED, + x, 0, rect.right - BUTTON_WIDTH * 4, + URLBAR_HEIGHT, hWnd, 0, hInst, 0); + + // Assign the edit window's WNDPROC to this function so that we can + // capture the enter key + editWndOldProc = + reinterpret_cast(GetWindowLongPtr(editWnd, GWLP_WNDPROC)); + SetWindowLongPtr(editWnd, GWLP_WNDPROC, + reinterpret_cast(WndProc)); + g_handler->SetEditHwnd(editWnd); + g_handler->SetButtonHwnds(backWnd, forwardWnd, reloadWnd, stopWnd); + + rect.top += URLBAR_HEIGHT; + + CefWindowInfo info; + CefBrowserSettings settings; + + // Populate the settings based on command line arguments. + AppGetBrowserSettings(settings); + + // Initialize window info to the defaults for a child window + info.SetAsChild(hWnd, rect); + + // Creat the new child browser window + CefBrowserHost::CreateBrowser(info, g_handler.get(), + g_handler->GetStartupURL(), settings); + + return 0; + } + + case WM_COMMAND: { + CefRefPtr browser; + if (g_handler.get()) + browser = g_handler->GetBrowser(); + + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); + // Parse the menu selections: + switch (wmId) { + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + return 0; + case IDM_EXIT: + DestroyWindow(hWnd); + return 0; + case ID_WARN_CONSOLEMESSAGE: + if (g_handler.get()) { + std::wstringstream ss; + ss << L"Console messages will be written to " + << std::wstring(CefString(g_handler->GetLogFile())); + MessageBox(hWnd, ss.str().c_str(), L"Console Messages", + MB_OK | MB_ICONINFORMATION); + } + return 0; + case ID_WARN_DOWNLOADCOMPLETE: + case ID_WARN_DOWNLOADERROR: + if (g_handler.get()) { + std::wstringstream ss; + ss << L"File \"" << + std::wstring(CefString(g_handler->GetLastDownloadFile())) << + L"\" "; + + if (wmId == ID_WARN_DOWNLOADCOMPLETE) + ss << L"downloaded successfully."; + else + ss << L"failed to download."; + + MessageBox(hWnd, ss.str().c_str(), L"File Download", + MB_OK | MB_ICONINFORMATION); + } + return 0; + case IDC_NAV_BACK: // Back button + if (browser.get()) + browser->GoBack(); + return 0; + case IDC_NAV_FORWARD: // Forward button + if (browser.get()) + browser->GoForward(); + return 0; + case IDC_NAV_RELOAD: // Reload button + if (browser.get()) + browser->Reload(); + return 0; + case IDC_NAV_STOP: // Stop button + if (browser.get()) + browser->StopLoad(); + return 0; + case ID_TESTS_GETSOURCE: // Test the GetSource function + if (browser.get()) + RunGetSourceTest(browser); + return 0; + case ID_TESTS_GETTEXT: // Test the GetText function + if (browser.get()) + RunGetTextTest(browser); + return 0; + case ID_TESTS_POPUP: // Test a popup window + if (browser.get()) + RunPopupTest(browser); + return 0; + case ID_TESTS_REQUEST: // Test a request + if (browser.get()) + RunRequestTest(browser); + return 0; + case ID_TESTS_SCHEME_HANDLER: // Test the scheme handler + if (browser.get()) + scheme_test::RunTest(browser); + return 0; + case ID_TESTS_BINDING: // Test JavaScript binding + if (browser.get()) + binding_test::RunTest(browser); + return 0; + case ID_TESTS_DIALOGS: // Test JavaScript dialogs + if (browser.get()) + RunDialogTest(browser); + return 0; + case ID_TESTS_PLUGIN_INFO: // Test plugin info + if (browser.get()) + RunPluginInfoTest(browser); + return 0; + case ID_TESTS_DOM_ACCESS: // Test DOM access + if (browser.get()) + dom_test::RunTest(browser); + return 0; + case ID_TESTS_LOCALSTORAGE: // Test localStorage + if (browser.get()) + RunLocalStorageTest(browser); + return 0; + case ID_TESTS_ACCELERATED2DCANVAS: // Test accelerated 2d canvas + if (browser.get()) + RunAccelerated2DCanvasTest(browser); + return 0; + case ID_TESTS_ACCELERATEDLAYERS: // Test accelerated layers + if (browser.get()) + RunAcceleratedLayersTest(browser); + return 0; + case ID_TESTS_WEBGL: // Test WebGL + if (browser.get()) + RunWebGLTest(browser); + return 0; + case ID_TESTS_HTML5VIDEO: // Test HTML5 video + if (browser.get()) + RunHTML5VideoTest(browser); + return 0; + case ID_TESTS_XMLHTTPREQUEST: // Test XMLHttpRequest + if (browser.get()) + RunXMLHTTPRequestTest(browser); + return 0; + case ID_TESTS_DRAGDROP: // Test drag & drop + if (browser.get()) + RunDragDropTest(browser); + return 0; + case ID_TESTS_GEOLOCATION: // Test geolocation + if (browser.get()) + RunGeolocationTest(browser); + return 0; + case ID_TESTS_ZOOM_IN: + if (browser.get()) + ModifyZoom(browser, 0.5); + return 0; + case ID_TESTS_ZOOM_OUT: + if (browser.get()) + ModifyZoom(browser, -0.5); + return 0; + case ID_TESTS_ZOOM_RESET: + if (browser.get()) + browser->GetHost()->SetZoomLevel(0.0); + return 0; + } + break; + } + + case WM_PAINT: + hdc = BeginPaint(hWnd, &ps); + EndPaint(hWnd, &ps); + return 0; + + case WM_SETFOCUS: + if (g_handler.get() && g_handler->GetBrowser()) { + // Pass focus to the browser window + CefWindowHandle hwnd = + g_handler->GetBrowser()->GetHost()->GetWindowHandle(); + if (hwnd) + PostMessage(hwnd, WM_SETFOCUS, wParam, NULL); + } + return 0; + + case WM_SIZE: + // Minimizing resizes the window to 0x0 which causes our layout to go all + // screwy, so we just ignore it. + if (wParam != SIZE_MINIMIZED && g_handler.get() && + g_handler->GetBrowser()) { + CefWindowHandle hwnd = + g_handler->GetBrowser()->GetHost()->GetWindowHandle(); + if (hwnd) { + // Resize the browser window and address bar to match the new frame + // window size + RECT rect; + GetClientRect(hWnd, &rect); + rect.top += URLBAR_HEIGHT; + + int urloffset = rect.left + BUTTON_WIDTH * 4; + + HDWP hdwp = BeginDeferWindowPos(1); + hdwp = DeferWindowPos(hdwp, editWnd, NULL, urloffset, + 0, rect.right - urloffset, URLBAR_HEIGHT, SWP_NOZORDER); + hdwp = DeferWindowPos(hdwp, hwnd, NULL, + rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + SWP_NOZORDER); + EndDeferWindowPos(hdwp); + } + } + break; + + case WM_ERASEBKGND: + if (g_handler.get() && g_handler->GetBrowser()) { + CefWindowHandle hwnd = + g_handler->GetBrowser()->GetHost()->GetWindowHandle(); + if (hwnd) { + // Dont erase the background if the browser window has been loaded + // (this avoids flashing) + return 0; + } + } + break; + + case WM_CLOSE: + if (g_handler.get()) { + CefRefPtr browser = g_handler->GetBrowser(); + if (browser.get()) { + // Let the browser window know we are about to destroy it. + browser->GetHost()->ParentWindowWillClose(); + } + } + break; + + case WM_DESTROY: + // The frame window has exited + PostQuitMessage(0); + return 0; + } + + return DefWindowProc(hWnd, message, wParam, lParam); + } +} + +// Message handler for about box. +INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + switch (message) { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; +} + + +// Global functions + +std::string AppGetWorkingDirectory() { + return szWorkingDir; +} diff --git a/atom/atom/client_handler.cpp b/atom/atom/client_handler.cpp new file mode 100644 index 000000000..5d7791860 --- /dev/null +++ b/atom/atom/client_handler.cpp @@ -0,0 +1,308 @@ +// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include +#include "include/cef_path_util.h" +#include "include/cef_process_util.h" +#include "include/cef_runnable.h" +#include "atom/client_handler.h" + +ClientHandler::ClientHandler() + : m_MainHwnd(NULL), + m_BrowserId(0), + m_EditHwnd(NULL), + m_BackHwnd(NULL), + m_ForwardHwnd(NULL), + m_StopHwnd(NULL), + m_ReloadHwnd(NULL), + m_bFocusOnEditableField(false) { + CreateProcessMessageDelegates(process_message_delegates_); + CreateRequestDelegates(request_delegates_); + + // Read command line settings. + CefRefPtr command_line = + CefCommandLine::GetGlobalCommandLine(); + + if (command_line->HasSwitch("url")) + m_StartupURL = command_line->GetSwitchValue("url"); + if (m_StartupURL.empty()) + m_StartupURL = "http://www.google.com/"; + + m_bExternalDevTools = command_line->HasSwitch("external-devtools"); +} + +ClientHandler::~ClientHandler() { +} + +bool ClientHandler::OnProcessMessageReceived( + CefRefPtr browser, + CefProcessId source_process, + CefRefPtr message) { + + return false; +} + +void ClientHandler::OnBeforeContextMenu( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + CefRefPtr model) { + + model->AddItem(MENU_ID_USER_FIRST, "&Show DevTools"); + CefString devtools_url = browser->GetHost()->GetDevToolsURL(true); + + // Disable the menu option if DevTools isn't enabled or if a window already open for the current URL. + if (devtools_url.empty() || m_OpenDevToolsURLs.find(devtools_url) != m_OpenDevToolsURLs.end()) { + model->SetEnabled(MENU_ID_USER_FIRST, false); + } +} + +bool ClientHandler::OnContextMenuCommand( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + int command_id, + EventFlags event_flags) { + + if (command_id == MENU_ID_USER_FIRST) { + ShowDevTools(browser); + return true; + } + else { + return false; + } +} + +void ClientHandler::OnLoadingStateChange(CefRefPtr browser, + bool isLoading, + bool canGoBack, + bool canGoForward) { + REQUIRE_UI_THREAD(); +} + +bool ClientHandler::OnConsoleMessage(CefRefPtr browser, + const CefString& message, + const CefString& source, + int line) { + REQUIRE_UI_THREAD(); + + return false; +} + +void ClientHandler::OnBeforeDownload( + CefRefPtr browser, + CefRefPtr download_item, + const CefString& suggested_name, + CefRefPtr callback) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::OnDownloadUpdated( + CefRefPtr browser, + CefRefPtr download_item, + CefRefPtr callback) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::OnRequestGeolocationPermission( + CefRefPtr browser, + const CefString& requesting_url, + int request_id, + CefRefPtr callback) { +} + +bool ClientHandler::OnPreKeyEvent(CefRefPtr browser, + const CefKeyEvent& event, + CefEventHandle os_event, + bool* is_keyboard_shortcut) { + + return false; +} + +void ClientHandler::OnAfterCreated(CefRefPtr browser) { + REQUIRE_UI_THREAD(); + + AutoLock lock_scope(this); + if (!m_Browser.get()) { + // We need to keep the main child window, but not popup windows + m_Browser = browser; + m_BrowserId = browser->GetIdentifier(); + } +} + +bool ClientHandler::DoClose(CefRefPtr browser) { + REQUIRE_UI_THREAD(); + + if (m_BrowserId == browser->GetIdentifier()) { + // Since the main window contains the browser window, we need to close + // the parent window instead of the browser window. + CloseMainWindow(); + + // Return true here so that we can skip closing the browser window + // in this pass. (It will be destroyed due to the call to close + // the parent above.) + return true; + } + + // A popup browser window is not contained in another window, so we can let + // these windows close by themselves. + return false; +} + +void ClientHandler::OnBeforeClose(CefRefPtr browser) { + REQUIRE_UI_THREAD(); + + if (m_BrowserId == browser->GetIdentifier()) { + m_Browser = NULL; // Free the browser pointer so that the browser can be destroyed + } + else if (browser->IsPopup()) { + // Remove the record for DevTools popup windows. + std::set::iterator it = m_OpenDevToolsURLs.find(browser->GetMainFrame()->GetURL()); + if (it != m_OpenDevToolsURLs.end()) + m_OpenDevToolsURLs.erase(it); + } +} + +void ClientHandler::OnLoadStart(CefRefPtr browser, + CefRefPtr frame) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::OnLoadEnd(CefRefPtr browser, + CefRefPtr frame, + int httpStatusCode) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::OnLoadError(CefRefPtr browser, + CefRefPtr frame, + ErrorCode errorCode, + const CefString& errorText, + const CefString& failedUrl) { + REQUIRE_UI_THREAD(); + + if (errorCode == ERR_ABORTED) // Don't display an error for downloaded files. + return; + else if (errorCode == ERR_UNKNOWN_URL_SCHEME) { // Don't display an error for external protocols that we allow the OS to handle. See OnProtocolExecution(). + return; + } + else { + std::stringstream ss; + ss << "

Failed to load URL " << std::string(failedUrl) << + " with error " << std::string(errorText) << " (" << errorCode << + ").

"; + frame->LoadString(ss.str(), failedUrl); + } +} + +void ClientHandler::OnRenderProcessTerminated(CefRefPtr browser, + TerminationStatus status) { + // Load the startup URL if that's not the website that we terminated on. + CefRefPtr frame = browser->GetMainFrame(); + std::string url = frame->GetURL(); + std::transform(url.begin(), url.end(), url.begin(), tolower); + + std::string startupURL = GetStartupURL(); + if (url.find(startupURL) != 0) + frame->LoadURL(startupURL); +} + +CefRefPtr ClientHandler::GetResourceHandler( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request) { + + return NULL; +} + +void ClientHandler::OnProtocolExecution(CefRefPtr browser, + const CefString& url, + bool& allow_os_execution) { + std::string urlStr = url; + + // Allow OS execution of Spotify URIs. + if (urlStr.find("spotify:") == 0) + allow_os_execution = true; +} + +void ClientHandler::SetMainHwnd(CefWindowHandle hwnd) { + AutoLock lock_scope(this); + m_MainHwnd = hwnd; +} + +void ClientHandler::SetEditHwnd(CefWindowHandle hwnd) { + AutoLock lock_scope(this); + m_EditHwnd = hwnd; +} + +void ClientHandler::SetButtonHwnds(CefWindowHandle backHwnd, + CefWindowHandle forwardHwnd, + CefWindowHandle reloadHwnd, + CefWindowHandle stopHwnd) { + AutoLock lock_scope(this); + m_BackHwnd = backHwnd; + m_ForwardHwnd = forwardHwnd; + m_ReloadHwnd = reloadHwnd; + m_StopHwnd = stopHwnd; +} + +std::string ClientHandler::GetLogFile() { + AutoLock lock_scope(this); + return m_LogFile; +} + +void ClientHandler::SetLastDownloadFile(const std::string& fileName) { + AutoLock lock_scope(this); + m_LastDownloadFile = fileName; +} + +std::string ClientHandler::GetLastDownloadFile() { + AutoLock lock_scope(this); + return m_LastDownloadFile; +} + +void ClientHandler::ShowDevTools(CefRefPtr browser) { + std::string devtools_url = browser->GetHost()->GetDevToolsURL(true); + if (!devtools_url.empty()) { + if (m_bExternalDevTools) { + LaunchExternalBrowser(devtools_url); // Open DevTools in an external browser window. + } + else if (m_OpenDevToolsURLs.find(devtools_url) == m_OpenDevToolsURLs.end()) { + m_OpenDevToolsURLs.insert(devtools_url); // Open DevTools in a popup window. + browser->GetMainFrame()->ExecuteJavaScript("window.open('" + devtools_url + "');", "about:blank", 0); + } + } +} + +// static +void ClientHandler::LaunchExternalBrowser(const std::string& url) { + if (CefCurrentlyOn(TID_PROCESS_LAUNCHER)) { + // Retrieve the current executable path. + CefString file_exe; + if (!CefGetPath(PK_FILE_EXE, file_exe)) + return; + + // Create the command line. + CefRefPtr command_line = + CefCommandLine::CreateCommandLine(); + command_line->SetProgram(file_exe); + command_line->AppendSwitchWithValue("url", url); + + // Launch the process. + CefLaunchProcess(command_line); + } else { + // Execute on the PROCESS_LAUNCHER thread. + CefPostTask(TID_PROCESS_LAUNCHER, + NewCefRunnableFunction(&ClientHandler::LaunchExternalBrowser, url)); + } +} + +// static +void ClientHandler::CreateProcessMessageDelegates( + ProcessMessageDelegateSet& delegates) { +} + +// static +void ClientHandler::CreateRequestDelegates(RequestDelegateSet& delegates) { +} diff --git a/atom/atom/client_handler.h b/atom/atom/client_handler.h new file mode 100644 index 000000000..09cb30ad3 --- /dev/null +++ b/atom/atom/client_handler.h @@ -0,0 +1,280 @@ +// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#ifndef CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_ +#define CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_ +#pragma once + +#include +#include +#include "include/cef_client.h" +#include "atom/util.h" + + +// Define this value to redirect all popup URLs to the main application browser +// window. +// #define TEST_REDIRECT_POPUP_URLS + + +// ClientHandler implementation. +class ClientHandler : public CefClient, + public CefContextMenuHandler, + public CefDisplayHandler, + public CefDownloadHandler, + public CefGeolocationHandler, + public CefKeyboardHandler, + public CefLifeSpanHandler, + public CefLoadHandler, + public CefRequestHandler { + public: + // Interface for process message delegates. Do not perform work in the + // RenderDelegate constructor. + class ProcessMessageDelegate : public virtual CefBase { + public: + // Called when a process message is received. Return true if the message was + // handled and should not be passed on to other handlers. + // ProcessMessageDelegates should check for unique message names to avoid + // interfering with each other. + virtual bool OnProcessMessageReceived( + CefRefPtr handler, + CefRefPtr browser, + CefProcessId source_process, + CefRefPtr message) { + return false; + } + }; + + typedef std::set > + ProcessMessageDelegateSet; + + // Interface for request handler delegates. Do not perform work in the + // RequestDelegate constructor. + class RequestDelegate : public virtual CefBase { + public: + // Called to retrieve a resource handler. + virtual CefRefPtr GetResourceHandler( + CefRefPtr handler, + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request) { + return NULL; + } + }; + + typedef std::set > RequestDelegateSet; + + ClientHandler(); + virtual ~ClientHandler(); + + // CefClient methods + virtual CefRefPtr GetContextMenuHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetDisplayHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetDownloadHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetGeolocationHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetKeyboardHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetLifeSpanHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetLoadHandler() OVERRIDE { + return this; + } + virtual CefRefPtr GetRequestHandler() OVERRIDE { + return this; + } + virtual bool OnProcessMessageReceived(CefRefPtr browser, + CefProcessId source_process, + CefRefPtr message) + OVERRIDE; + + // CefContextMenuHandler methods + virtual void OnBeforeContextMenu(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + CefRefPtr model) OVERRIDE; + virtual bool OnContextMenuCommand(CefRefPtr browser, + CefRefPtr frame, + CefRefPtr params, + int command_id, + EventFlags event_flags) OVERRIDE; + + // CefDisplayHandler methods + virtual void OnLoadingStateChange(CefRefPtr browser, + bool isLoading, + bool canGoBack, + bool canGoForward) OVERRIDE; + virtual void OnAddressChange(CefRefPtr browser, + CefRefPtr frame, + const CefString& url) OVERRIDE; + virtual void OnTitleChange(CefRefPtr browser, + const CefString& title) OVERRIDE; + virtual bool OnConsoleMessage(CefRefPtr browser, + const CefString& message, + const CefString& source, + int line) OVERRIDE; + + // CefDownloadHandler methods + virtual void OnBeforeDownload( + CefRefPtr browser, + CefRefPtr download_item, + const CefString& suggested_name, + CefRefPtr callback) OVERRIDE; + virtual void OnDownloadUpdated( + CefRefPtr browser, + CefRefPtr download_item, + CefRefPtr callback) OVERRIDE; + + // CefGeolocationHandler methods + virtual void OnRequestGeolocationPermission( + CefRefPtr browser, + const CefString& requesting_url, + int request_id, + CefRefPtr callback) OVERRIDE; + + // CefKeyboardHandler methods + virtual bool OnPreKeyEvent(CefRefPtr browser, + const CefKeyEvent& event, + CefEventHandle os_event, + bool* is_keyboard_shortcut) OVERRIDE; + + // CefLifeSpanHandler methods + virtual void OnAfterCreated(CefRefPtr browser) OVERRIDE; + virtual bool DoClose(CefRefPtr browser) OVERRIDE; + virtual void OnBeforeClose(CefRefPtr browser) OVERRIDE; + + // CefLoadHandler methods + virtual void OnLoadStart(CefRefPtr browser, + CefRefPtr frame) OVERRIDE; + virtual void OnLoadEnd(CefRefPtr browser, + CefRefPtr frame, + int httpStatusCode) OVERRIDE; + virtual void OnLoadError(CefRefPtr browser, + CefRefPtr frame, + ErrorCode errorCode, + const CefString& errorText, + const CefString& failedUrl) OVERRIDE; + virtual void OnRenderProcessTerminated(CefRefPtr browser, + TerminationStatus status) OVERRIDE; + + // CefRequestHandler methods + virtual CefRefPtr GetResourceHandler( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request) OVERRIDE; + virtual void OnProtocolExecution(CefRefPtr browser, + const CefString& url, + bool& allow_os_execution) OVERRIDE; + + void SetMainHwnd(CefWindowHandle hwnd); + CefWindowHandle GetMainHwnd() { return m_MainHwnd; } + void SetEditHwnd(CefWindowHandle hwnd); + void SetButtonHwnds(CefWindowHandle backHwnd, + CefWindowHandle forwardHwnd, + CefWindowHandle reloadHwnd, + CefWindowHandle stopHwnd); + + CefRefPtr GetBrowser() { return m_Browser; } + int GetBrowserId() { return m_BrowserId; } + + std::string GetLogFile(); + + void SetLastDownloadFile(const std::string& fileName); + std::string GetLastDownloadFile(); + + // Send a notification to the application. Notifications should not block the + // caller. + enum NotificationType { + NOTIFY_CONSOLE_MESSAGE, + NOTIFY_DOWNLOAD_COMPLETE, + NOTIFY_DOWNLOAD_ERROR, + }; + + void CloseMainWindow(); + + void ShowDevTools(CefRefPtr browser); + + // Returns the startup URL. + std::string GetStartupURL() { return m_StartupURL; } + + // Create an external browser window that loads the specified URL. + static void LaunchExternalBrowser(const std::string& url); + + protected: + + // Create all of ProcessMessageDelegate objects. + static void CreateProcessMessageDelegates( + ProcessMessageDelegateSet& delegates); + + // Create all of RequestDelegateSet objects. + static void CreateRequestDelegates(RequestDelegateSet& delegates); + + // Test context menu creation. + void BuildTestMenu(CefRefPtr model); + bool ExecuteTestMenu(int command_id); + struct TestMenuState { + TestMenuState() : check_item(true), radio_item(0) {} + bool check_item; + int radio_item; + } m_TestMenuState; + + // Returns the full download path for the specified file, or an empty path to + // use the default temp directory. + std::string GetDownloadPath(const std::string& file_name); + + // The child browser window + CefRefPtr m_Browser; + + // The main frame window handle + CefWindowHandle m_MainHwnd; + + // The child browser id + int m_BrowserId; + + // The edit window handle + CefWindowHandle m_EditHwnd; + + // The button window handles + CefWindowHandle m_BackHwnd; + CefWindowHandle m_ForwardHwnd; + CefWindowHandle m_StopHwnd; + CefWindowHandle m_ReloadHwnd; + + // Support for logging. + std::string m_LogFile; + + // Support for downloading files. + std::string m_LastDownloadFile; + + // True if an editable field currently has focus. + bool m_bFocusOnEditableField; + + // Registered delegates. + ProcessMessageDelegateSet process_message_delegates_; + RequestDelegateSet request_delegates_; + + // If true DevTools will be opened in an external browser window. + bool m_bExternalDevTools; + + // List of open DevTools URLs if not using an external browser window. + std::set m_OpenDevToolsURLs; + + // The startup URL. + std::string m_StartupURL; + + // Include the default reference counting implementation. + IMPLEMENT_REFCOUNTING(ClientHandler); + // Include the default locking implementation. + IMPLEMENT_LOCKING(ClientHandler); +}; + +#endif // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_ diff --git a/atom/atom/client_handler_gtk.cpp b/atom/atom/client_handler_gtk.cpp new file mode 100644 index 000000000..a35b04e61 --- /dev/null +++ b/atom/atom/client_handler_gtk.cpp @@ -0,0 +1,63 @@ +// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include +#include +#include "cefclient/client_handler.h" +#include "include/cef_browser.h" +#include "include/cef_frame.h" + +void ClientHandler::OnAddressChange(CefRefPtr browser, + CefRefPtr frame, + const CefString& url) { + REQUIRE_UI_THREAD(); + + if (m_BrowserId == browser->GetIdentifier() && frame->IsMain()) { + // Set the edit window text + std::string urlStr(url); + gtk_entry_set_text(GTK_ENTRY(m_EditHwnd), urlStr.c_str()); + } +} + +void ClientHandler::OnTitleChange(CefRefPtr browser, + const CefString& title) { + REQUIRE_UI_THREAD(); + + GtkWidget* window = gtk_widget_get_ancestor( + GTK_WIDGET(browser->GetHost()->GetWindowHandle()), + GTK_TYPE_WINDOW); + std::string titleStr(title); + gtk_window_set_title(GTK_WINDOW(window), titleStr.c_str()); +} + +void ClientHandler::SendNotification(NotificationType type) { + // TODO(port): Implement this method. +} + +void ClientHandler::SetLoading(bool isLoading) { + if (isLoading) + gtk_widget_set_sensitive(GTK_WIDGET(m_StopHwnd), true); + else + gtk_widget_set_sensitive(GTK_WIDGET(m_StopHwnd), false); +} + +void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) { + if (canGoBack) + gtk_widget_set_sensitive(GTK_WIDGET(m_BackHwnd), true); + else + gtk_widget_set_sensitive(GTK_WIDGET(m_BackHwnd), false); + + if (canGoForward) + gtk_widget_set_sensitive(GTK_WIDGET(m_ForwardHwnd), true); + else + gtk_widget_set_sensitive(GTK_WIDGET(m_ForwardHwnd), false); +} + +void ClientHandler::CloseMainWindow() { + // TODO(port): Close main window. +} + +std::string ClientHandler::GetDownloadPath(const std::string& file_name) { + return std::string(); +} diff --git a/atom/atom/client_handler_mac.mm b/atom/atom/client_handler_mac.mm new file mode 100644 index 000000000..f2ffd5ce6 --- /dev/null +++ b/atom/atom/client_handler_mac.mm @@ -0,0 +1,32 @@ +#import +#import "include/cef_browser.h" +#import "include/cef_frame.h" +#import "atom/client_handler.h" + +#ifndef PROCESS_HELPER_APP +CefRefPtr g_handler; +#endif + +void ClientHandler::OnAddressChange(CefRefPtr browser, + CefRefPtr frame, + const CefString& url) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::OnTitleChange(CefRefPtr browser, + const CefString& title) { + REQUIRE_UI_THREAD(); +} + +void ClientHandler::CloseMainWindow() { + NSWindow* window = nil; +#ifndef PROCESS_HELPER_APP + if (g_handler.get()) window = (NSWindow *)g_handler->GetMainHwnd(); +#endif + + [window performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:NO]; +} + +std::string ClientHandler::GetDownloadPath(const std::string& file_name) { + return std::string(); +} diff --git a/atom/atom/client_handler_win.cpp b/atom/atom/client_handler_win.cpp new file mode 100644 index 000000000..fe9944255 --- /dev/null +++ b/atom/atom/client_handler_win.cpp @@ -0,0 +1,86 @@ +// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include "cefclient/client_handler.h" + +#include +#include +#include + +#include "include/cef_browser.h" +#include "include/cef_frame.h" +#include "cefclient/resource.h" + +void ClientHandler::OnAddressChange(CefRefPtr browser, + CefRefPtr frame, + const CefString& url) { + REQUIRE_UI_THREAD(); + + if (m_BrowserId == browser->GetIdentifier() && frame->IsMain()) { + // Set the edit window text + SetWindowText(m_EditHwnd, std::wstring(url).c_str()); + } +} + +void ClientHandler::OnTitleChange(CefRefPtr browser, + const CefString& title) { + REQUIRE_UI_THREAD(); + + // Set the frame window title bar + CefWindowHandle hwnd = browser->GetHost()->GetWindowHandle(); + if (m_BrowserId == browser->GetIdentifier()) { + // The frame window will be the parent of the browser window + hwnd = GetParent(hwnd); + } + SetWindowText(hwnd, std::wstring(title).c_str()); +} + +void ClientHandler::SendNotification(NotificationType type) { + UINT id; + switch (type) { + case NOTIFY_CONSOLE_MESSAGE: + id = ID_WARN_CONSOLEMESSAGE; + break; + case NOTIFY_DOWNLOAD_COMPLETE: + id = ID_WARN_DOWNLOADCOMPLETE; + break; + case NOTIFY_DOWNLOAD_ERROR: + id = ID_WARN_DOWNLOADERROR; + break; + default: + return; + } + PostMessage(m_MainHwnd, WM_COMMAND, id, 0); +} + +void ClientHandler::SetLoading(bool isLoading) { + ASSERT(m_EditHwnd != NULL && m_ReloadHwnd != NULL && m_StopHwnd != NULL); + EnableWindow(m_EditHwnd, TRUE); + EnableWindow(m_ReloadHwnd, !isLoading); + EnableWindow(m_StopHwnd, isLoading); +} + +void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) { + ASSERT(m_BackHwnd != NULL && m_ForwardHwnd != NULL); + EnableWindow(m_BackHwnd, canGoBack); + EnableWindow(m_ForwardHwnd, canGoForward); +} + +void ClientHandler::CloseMainWindow() { + ::PostMessage(m_MainHwnd, WM_CLOSE, 0, 0); +} + +std::string ClientHandler::GetDownloadPath(const std::string& file_name) { + TCHAR szFolderPath[MAX_PATH]; + std::string path; + + // Save the file in the user's "My Documents" folder. + if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, + NULL, 0, szFolderPath))) { + path = CefString(szFolderPath); + path += "\\" + file_name; + } + + return path; +} diff --git a/atom/atom/mac/English.lproj/InfoPlist.strings b/atom/atom/mac/English.lproj/InfoPlist.strings new file mode 100644 index 000000000..fe2abe11b --- /dev/null +++ b/atom/atom/mac/English.lproj/InfoPlist.strings @@ -0,0 +1,3 @@ +/* Localized versions of Info.plist keys */ + +NSHumanReadableCopyright = "© Chromium Embedded Framework Authors, 2010"; diff --git a/atom/atom/mac/English.lproj/MainMenu.xib b/atom/atom/mac/English.lproj/MainMenu.xib new file mode 100644 index 000000000..196d4487b --- /dev/null +++ b/atom/atom/mac/English.lproj/MainMenu.xib @@ -0,0 +1,1983 @@ + + + + 1050 + 11D50d + 2182 + 1138.32 + 568.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 2182 + + + YES + NSUserDefaultsController + NSMenu + NSMenuItem + NSCustomObject + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + ClientApplication + + + FirstResponder + + + ClientApplication + + + AMainMenu + + YES + + + cefclient + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + TestShell + + YES + + + About cefclient + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + Services + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide cefclient + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit cefclient + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + File + + 1048576 + 2147483647 + + + submenuAction: + + File + + YES + + + New + n + 1048576 + 2147483647 + + + + + + Open… + o + 1048576 + 2147483647 + + + + + + Open Recent + + 1048576 + 2147483647 + + + submenuAction: + + Open Recent + + YES + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Save + s + 1048576 + 2147483647 + + + + + + Save As… + S + 1179648 + 2147483647 + + + + + + Revert to Saved + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup... + P + 1179648 + 2147483647 + + + + + + + Print… + p + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + Edit + + YES + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1179648 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Find + + 1048576 + 2147483647 + + + submenuAction: + + Find + + YES + + + Find… + f + 1048576 + 2147483647 + + + 1 + + + + Find Next + g + 1048576 + 2147483647 + + + 2 + + + + Find Previous + G + 1179648 + 2147483647 + + + 3 + + + + Use Selection for Find + e + 1048576 + 2147483647 + + + 7 + + + + Jump to Selection + j + 1048576 + 2147483647 + + + + + + + + + Spelling and Grammar + + 1048576 + 2147483647 + + + submenuAction: + + Spelling and Grammar + + YES + + + Show Spelling… + : + 1048576 + 2147483647 + + + + + + Check Spelling + ; + 1048576 + 2147483647 + + + + + + Check Spelling While Typing + + 1048576 + 2147483647 + + + + + + Check Grammar With Spelling + + 1048576 + 2147483647 + + + + + + + + + Substitutions + + 1048576 + 2147483647 + + + submenuAction: + + Substitutions + + YES + + + Smart Copy/Paste + f + 1048576 + 2147483647 + + + 1 + + + + Smart Quotes + g + 1048576 + 2147483647 + + + 2 + + + + Smart Links + G + 1179648 + 2147483647 + + + 3 + + + + + + + Speech + + 1048576 + 2147483647 + + + submenuAction: + + Speech + + YES + + + Start Speaking + + 1048576 + 2147483647 + + + + + + Stop Speaking + + 1048576 + 2147483647 + + + + + + + + + + + + Format + + 1048576 + 2147483647 + + + submenuAction: + + Format + + YES + + + Show Fonts + t + 1048576 + 2147483647 + + + + + + Show Colors + C + 1179648 + 2147483647 + + + + + + + + + View + + 1048576 + 2147483647 + + + submenuAction: + + View + + YES + + + Show Toolbar + t + 1572864 + 2147483647 + + + + + + Customize Toolbar… + + 1048576 + 2147483647 + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + Window + + YES + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 1048576 + 2147483647 + + + submenuAction: + + Help + + YES + + + cefclient Help + ? + 1048576 + 2147483647 + + + + + + + + _NSMainMenu + + + YES + + + + + YES + + + delegate + + + + 440 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + print: + + + + 86 + + + + runPageLayout: + + + + 87 + + + + clearRecentDocuments: + + + + 127 + + + + performClose: + + + + 193 + + + + toggleContinuousSpellChecking: + + + + 222 + + + + undo: + + + + 223 + + + + copy: + + + + 224 + + + + checkSpelling: + + + + 225 + + + + paste: + + + + 226 + + + + stopSpeaking: + + + + 227 + + + + cut: + + + + 228 + + + + showGuessPanel: + + + + 230 + + + + redo: + + + + 231 + + + + selectAll: + + + + 232 + + + + startSpeaking: + + + + 233 + + + + delete: + + + + 235 + + + + performZoom: + + + + 240 + + + + performFindPanelAction: + + + + 241 + + + + centerSelectionInVisibleArea: + + + + 245 + + + + toggleGrammarChecking: + + + + 347 + + + + toggleSmartInsertDelete: + + + + 355 + + + + toggleAutomaticQuoteSubstitution: + + + + 356 + + + + toggleAutomaticLinkDetection: + + + + 357 + + + + showHelp: + + + + 360 + + + + orderFrontColorPanel: + + + + 361 + + + + saveDocument: + + + + 362 + + + + saveDocumentAs: + + + + 363 + + + + revertDocumentToSaved: + + + + 364 + + + + runToolbarCustomizationPalette: + + + + 365 + + + + toggleToolbarShown: + + + + 366 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + terminate: + + + + 369 + + + + unhideAllApplications: + + + + 370 + + + + newDocument: + + + + 373 + + + + openDocument: + + + + 374 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + YES + + + + + + + + + + MainMenu + + + 19 + + + YES + + + + + + 56 + + + YES + + + + + + 103 + + + YES + + + + 1 + + + 217 + + + YES + + + + + + 83 + + + YES + + + + + + 81 + + + YES + + + + + + + + + + + + + + + + 75 + + + 3 + + + 80 + + + 8 + + + 78 + + + 6 + + + 72 + + + + + 82 + + + 9 + + + 124 + + + YES + + + + + + 77 + + + 5 + + + 73 + + + 1 + + + 79 + + + 7 + + + 112 + + + 10 + + + 74 + + + 2 + + + 125 + + + YES + + + + + + 126 + + + + + 205 + + + YES + + + + + + + + + + + + + + + + + + 202 + + + + + 198 + + + + + 207 + + + + + 214 + + + + + 199 + + + + + 203 + + + + + 197 + + + + + 206 + + + + + 215 + + + + + 218 + + + YES + + + + + + 216 + + + YES + + + + + + 200 + + + YES + + + + + + + + + 219 + + + + + 201 + + + + + 204 + + + + + 220 + + + YES + + + + + + + + + + 213 + + + + + 210 + + + + + 221 + + + + + 208 + + + + + 209 + + + + + 106 + + + YES + + + + 2 + + + 111 + + + + + 57 + + + YES + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + 1111 + + + 144 + + + + + 129 + + + 121 + + + 143 + + + + + 236 + + + + + 131 + + + YES + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + YES + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 295 + + + YES + + + + + + 296 + + + YES + + + + + + + 297 + + + + + 298 + + + + + 299 + + + YES + + + + + + 300 + + + YES + + + + + + + 344 + + + + + 345 + + + + + 211 + + + YES + + + + + + 212 + + + YES + + + + + + + 195 + + + + + 196 + + + + + 346 + + + + + 348 + + + YES + + + + + + 349 + + + YES + + + + + + + + 350 + + + + + 351 + + + + + 354 + + + + + 389 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 103.IBPluginDependency + 106.IBPluginDependency + 111.IBPluginDependency + 112.IBPluginDependency + 124.IBPluginDependency + 125.IBPluginDependency + 126.IBPluginDependency + 129.IBPluginDependency + 130.IBPluginDependency + 131.IBPluginDependency + 134.IBPluginDependency + 136.IBPluginDependency + 143.IBPluginDependency + 144.IBPluginDependency + 145.IBPluginDependency + 149.IBPluginDependency + 150.IBPluginDependency + 19.IBPluginDependency + 195.IBPluginDependency + 196.IBPluginDependency + 197.IBPluginDependency + 198.IBPluginDependency + 199.IBPluginDependency + 200.IBPluginDependency + 201.IBPluginDependency + 202.IBPluginDependency + 203.IBPluginDependency + 204.IBPluginDependency + 205.IBPluginDependency + 206.IBPluginDependency + 207.IBPluginDependency + 208.IBPluginDependency + 209.IBPluginDependency + 210.IBPluginDependency + 211.IBPluginDependency + 212.IBPluginDependency + 213.IBPluginDependency + 214.IBPluginDependency + 215.IBPluginDependency + 216.IBPluginDependency + 217.IBPluginDependency + 218.IBPluginDependency + 219.IBPluginDependency + 220.IBPluginDependency + 221.IBPluginDependency + 23.IBPluginDependency + 236.IBPluginDependency + 239.IBPluginDependency + 24.IBPluginDependency + 29.IBPluginDependency + 295.IBPluginDependency + 296.IBPluginDependency + 297.IBPluginDependency + 298.IBPluginDependency + 299.IBPluginDependency + 300.IBPluginDependency + 344.IBPluginDependency + 345.IBPluginDependency + 346.IBPluginDependency + 348.IBPluginDependency + 349.IBPluginDependency + 350.IBPluginDependency + 351.IBPluginDependency + 354.IBPluginDependency + 389.IBPluginDependency + 5.IBPluginDependency + 56.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 72.IBPluginDependency + 73.IBPluginDependency + 74.IBPluginDependency + 75.IBPluginDependency + 77.IBPluginDependency + 78.IBPluginDependency + 79.IBPluginDependency + 80.IBPluginDependency + 81.IBPluginDependency + 82.IBPluginDependency + 83.IBPluginDependency + 92.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + + + + YES + + + + + 440 + + + + YES + + ClientApplication + NSApplication + + YES + + YES + goBack: + goForward: + reload: + stopLoading: + takeURLStringValueFrom: + + + YES + id + id + id + id + NSTextField + + + + YES + + YES + goBack: + goForward: + reload: + stopLoading: + takeURLStringValueFrom: + + + YES + + goBack: + id + + + goForward: + id + + + reload: + id + + + stopLoading: + id + + + takeURLStringValueFrom: + NSTextField + + + + + IBProjectSource + ./Classes/ClientApplication.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {11, 11} + {10, 3} + + + + diff --git a/atom/atom/mac/atom.icns b/atom/atom/mac/atom.icns new file mode 100644 index 0000000000000000000000000000000000000000..f3beba809e948d661ea14998010dbab0be2d58e5 GIT binary patch literal 63727 zcmeFZXK-UjmZ*s$%X@EF-qC{~0nmV^tZaL!J(O*Q{N){y+MxUA;2v$=_tH z-mrDoz5@sUgU^9|yS8myll|})D^{-Gaqx_7)a&yhKlJhWCa=GEWY_vtS()mr+_b0c zi~sgN|L6bwclhV~|1N+3@2;Ah&8yRd><#@pmhe7Qm%@)@EgI*nc{fG4t=#=imQw z?$E~Um79*g_~nn2|1Up3xg~q$mb{n#<;T_MzrI$qZRM)11+V_6AE*Cc-x6+LwQ5`8 z>;L&j%3mnq<%{0<&p)m{|9U~RV_E*k`2XMkKa~Gb2K=x3{B1Y=FaP}i!aw}`;YWS` z^=tGCCv2w#c;R}6>|NY#DItW}%#7F7RS zHTav~{lgD_e)pSq^uIb)v@atr0K)q12lC1)>rS6J`vaddr|YW9@(=BV@qKwluma`} zTXw?y;m{9FAPybezi;=}jjJEcANW}T%um*>TfbrbhVTCi-`B5$`N>0RgaJBgckbG?bJx|KS-W;_|E(bV$ibbvK3TPDL(ZQ3+=K54vJdUul>LPu zd&AxnyRQlgw(eUe5FB_#snuBZdXve}sZ(}n4c)4CwNcxqG-^$1-Q|;6f|ZB%3(+k3#?5O4n+8Wlhul6- zD9{(6Nc^tf9`Oef&XAkH5j&1>Q$dG&?8EH>!Om4+^IAbx``GyKum|ykF^nREcM*Gx z2+p_|H;JMS+)w(DQTOCf|7yXO^&r1Oa2%Z&A0G91k&qvwaXRXCMG0cY&3H%zb72HR z-?@X@N5*Reg7pJ}!qFT-UvpfJdBq@FgHf}y*J!G$B5l35Ud;! zkUK+dKz`y22nqSVYnCbI3I~l zImTfU8O8#1kWKjfQIei-a@p0!k z%1e+OMa3~ZPJVX0Fp6?y(8bd9M@Z1+8Fqh>7M+-KP5ALZoT5TBeHZtoCQFZ9h@c!E z^n_{ZCK~j3Mlz!8q{B54$cTp61nG-BcQo&JoS(x9gk?ydKj`y}cy91oS-Zzv)?n!*U27Y%dMl=Vn%K|L7?go30$#8Na$ zBHl6YP0)IsbGXx@NrnlBLo=TqJ6TxxcAG)1|CkqLXg`Vg#(Zhfki+e^<760^txz z1!)u+M?fy`{gBh+b`cDfV!8O;%lnU=%+2GKcExznFv*~d9~no}qG6}oFM z^HFxbIj^wbG7%wZEF8utgz^XM{*0)@=>t(JPBWRb-<;R`a zZN36whr{Q=DJn{{sYD1wCl2M8e8I3BMdJ(`q)^(Ay92!W?}wcZ)QwYkgk-0a+%z53 z9nJ5#ONJQ`4TWgZPr+k=r9~qy5Dnm-a3GvYax+Yz_QY$^7zLsX9*xmtfC~6CT0e-m zoV=(b?2FAzhi2Iu$4l|McbN!FgJ_gyf-Hu*QC=%A>h}Z!I~|@48IFAsN#13- z2m_*#5F2CzK5s@e>UIS@SYSMire;!++0c1yJd%tvOayF-MM9wt=$Ql;oxRJFcWDp}r$wOxykCFAYlSz7Cl*Y^?}q2zx6d(m7wIS&r$9Us;z$k; zxC6ZC2QjzX?+bFi7#ok@jm%;69Ftt6VpNi5iMvrIOw%~{m2ZOI#5_JfLWcvqBO_MM!4x1h*I+)%HAd7A&!VgBXocZ1zop}f#}LpcLF{%Bbtie1+DXJ zYLSamAWHJ07!xALUtIf+;NG79y-V+?( zUG~PcA^W7??eI-`@$o7DM1XX<$GuL+xYv%j?|dq+IsCrh=%!=BiW*r}bycNIRw1dX zkX6^z$YiyrPSu_{eeP6MMZxwD1%fq$8&_}GxN*aVjT>wmvo>wq*uQDj=1rS7ZCv+> z;NJxA2(s6}ko)1r!3|j(H>`(|bH}!g8$ZcjwR+3uJ-fHT$hm#<+7&QzuHL+B6O5ee zw!oORt?cyK(=VPs_v|z0Up!a);+gY5t$V)inbT+B&$FkWk?md~$lAUMM$S!Hf;F|5 z>g9@7vs$HVQ(KhvW|i97U}@6G59=t;$BL zPTSpLXl_#~8?-9DLVc;Fss5MQf_1Aw9%c->mgdHKg-UJFXpL=ptGwB&Z|iL}w&)a^ zW{pm1c>997rJ?17K(HD{PN}J-rLjS&P+C-4Q=6efF1Kp+-L1w}gHqe7(W{hiDwOgD z#ZO>RhLQ7Umgd%$W|dOau2Nd`hEBPE$97<<(1AgWX7^eP?vPf@SD!i%;ywaOdSYHdfG#;9xWQffQ(re3x3 ziczIk8{4!xwO+2QSJi{)%ho2jqDiCHbm+7uow-M)?KGHe@(Q&{tyfw!Ms=G(u53_0 z5^d3Hw4FMgNoVTOXu6D+zN%-mX1!i+)*Ii_8e3J3>IPnGM{}#PN!zCHG8!!gW1qII z+t~i=?Mk)Tpl`7l%|F+eTGfpj5MA}_&X!hXvrTuX*KF!A8hdqy9^;kWIsIx2h_+iy zztEamHBH(^(E97nR;8*%Z_xEw%pGP^w_amwJ+!N~TixEKmv>rBZ|Tg?BHAVpeWgpT zQnwn6dYi@E*zTJ;7^N4v>tgqCd4HG|ey!95ze(QNFuws&`02h2a&wKwM(OGjIW!KCf5nl1Wv zwXRj)k`ZmwC`@MKfYsXFWgWb-YfnzjnP*=(_xuG@Tc@?XUEi+J$$8OjulB0jvD=f0er z{kEJfhs`FluB+2*u|W4x@S=II^=bHrr_&0eeZ95YcJJA{FK2(wzL)z=7F}1jxkKOC zW>6S2qUyFbjj7!_&|$Up_5Ai~?{ClV&B-}$?KWBTUEPLuT}PWqoe{OEwR)||YPEG( z2W%aK9j4x6dvo%7EM4YyeP<`sv_ogsn&f;1Y-){8Yqqxcc6JQdItM$tQLE|2UHje|G~QLC}X*4}P}uCC8$9niMHtlT8;*7jYy+I6k7VfT^#-aae1 z*lO(UYwxgh8w`3qRN(j<18q8Uo5|4FsTp|ZTK7BMFYGq-f_D9e^ZLsHE zlkmf?-fO*`W?OrQ+1At3ZRydQ3~6V*F{smCyIq13{T*GF{=QD=hn?;E4&JP1uIeo&9Xu+7eYU{?+j~6^MQs_;&W`TRc0~FN+SCGooExroJu^tpw2xjiz>!zN@F}y}q7nY0>N5S3l_NH}`jS zSq5x+x_jFyi^;{e1zuwzx_Cd!$dp}6_clFyW-BxwUMi@NT?-su-*Q(p0bE^y;N*Hx4 zU0N7yG#Z6LW70R**B;yqgXb!Kak_v1ft;KJ`*Zg0&)E+v)dL3(9zJ~V$l+s$_vh?b z2ZLw!;3~mN8~hnqC0K1+HLyB+&Fa-FGXv*}?CcL#3RYcT34`XEH7i$rvSL-%>Q(F3 zt$q)}&#SX<2(q(Qtyy(daAGCD;$E{OXaBxq2lgL2u>a`(9q^7DF16B6^qP${ZL1l@stfaU?c%-VRsPcsDxHzx)s3^ZGue>0C|4LY` zt?U;RXTu`(aDnicu%w_$R3a7$D}_g^it}YBs!m9X;I9j+k5}av<{tz3RV!?QVi*JS z3WP<+g(ZcuQjw%oSXFqmy0oY^xAKG}UwEvfNGdEnR9KLEY=vMY3~GgID~pPYP6~^Q zD@7uyu&kosSaoShU2fG0X`bkKNm-#RXMdTnP`E8U1Qza)6_pg^3X2LWi-qOFva0<2 znv&9*yvmd1`K2dI%1VlMmz0R|OOL}?3(HcuqV6$y)Fq7q3-SzW%U zy0rXM(Sf|mLUDe1k)*J+s<8A4(R@*fuo}E3EUhaN)s~jm?azfON=`~elIr;0^&;J3|{`BkE_qtepK)y1-tk|#yW%0#EiB~|cWp`@;? zWb2O8`7)vSXt}gvwXix@azb1NT92J7C@sqsOGKy3rB&jx8d1^N!X4WW*5=EK#3!mG z728T>1>%zrMaAM=iL~@|g%qZRb>hO)ySMEqtSP82lIBY*q=h0`k>sRA%xgVem=+bC z;YFpV%ZrY0-MObMBU(`|k%_AdCAn$Q<7bK_;yh`2+1bkS>Piqjv~|a>0&O>uca zMP+%VsHRYwE9JEwKT`~%-kP zES2P!SBlS7Rn}CMS8v~L+qHe?j_up`i7L{fWi>_Rc~TJFnHDXms;)R+TU9HQN1rIMn`nu=%YDr&3uZ{EIR$Ie~5ckMcQ8bqtA z#g)QS!ipzEg)nzMS0k>gseHax^5RiYoF}RiR)VOoqNr9VD^6=Ye!f^DEe6q3)#6h% z73V5N=XUPcwXX_#S7nj3LRgVs2R*5xocF+ap|l*dN^7bmAbPe!RJ~>A?h0vztfaD7 zTrMmxsuRk}%6Vs$7Yn^yTD6J?eE!|&{S9kt2h~{tGBda_s zt>(3YXodKUNFo-cEAUJSRK85OQ+)Ewvu7*M%MNX;t*kv;UQsQoDypujt`eUv7E8<0 zqR*B{D~00Xos~t;K6_U7jBJ;%PF8bHDy*RAKQmLHYO9~EE_;p_JyUXy*IHXqC#$He7RvbX>cn%RDiEy})||X9GtlhX}^Omh!w{6*C+qQP=_H8@2Z`rb86%3dw2D1fO zw(P8|?5uaQSFOxmnVp@*50?rxAF*Ap7!YJ_+q2!aO|bp?wyeGTcU}`@?cTTfBM6@6 z92^kr-?>guZNB=>Z{C0Z!}qVf|H1VS-?=(){ra_@^Vw_m+63Ke*Q_#*jrmZL2+{;X z5Ez37TsYxz+xymLZG}~vpnhz0!smx5DuY8<4WeL(8zO0=u2H36Bfl@~7$2YXpadBV z`!N#22murc;Pwgc*yQFFFiIZ`jM?oTKM|lJC_ykZjiD$;_)*Wev#?*V{|GkXnDSy2 z5sU+aWgVD5fa3wwJ>n|ni}4Yc!xx|-<{O|W&SSta2pGFD_vpi7rvnK>wW2|qX3pOT zLhzWnfw{)q>0bv&o%R3`V#zQRUnvO@K`%?+#69DlbTKjRao|LVVVxc=Zt)f@ch8i*CDkBrm_PsMJH^90T5)^uw>$ z9--|%55|QRmBVGdI z13e+{v9k~mqX>?}N!*huW}JvO;3eb9Sfn@K5f3pm5rN<$=Hc1Rl%NJ=i1(V@52w?{oOm)-~H$}*RQ|-?gziS-ua7z z?+9QcBxm2gJ$v`=-n)0-zP+$aJaBOT-ZfzXJb3FjZMeREHSDmg-@J7rJb0TnuZ0J1 z-IlHJ;B8zbIQHx>e)-DFFa7%EpTG3$U%m44pZ(;emwx%vysVX*ZGt*@lAmd+SE}?7 zacEO$wQ9XW1wjFYyy0gnSHP}BwxG7LsZpgd>e~!jrO}|(sgy0Sz`fMccvi3m=C&)8 zw&n_jMsH}ds5N?%PN!BX)Y_&-MU#9TADP*%Z<4nvweWMRTCX!2j9QgStJ7)~Evg)F z0+x= zr#83ubai&?4(vN{@%2{}dTWQpq*WTy#T_cWroE%Lr?ayd7V3NVh^+b!h(ENcjOpS| zwO-o+0fO$DUHqc|umv`&U@5IrnKH#HgVx&F)6?5OXnSQ}PGh^-*x7DuH)u_V`UPut zcBu?)u$;B^ZtdM~mm`i$~! zh&UP57Fa{}{4&P^%e!`SPnWgBpwCpTM{Cj>6{f*!w!X6Zp241WtGTDAs{@wI>8kO? zW@X1agZn$zrFh&8oqd#?8NYx;VD&<)Xrp6)KQ(ZUz+>TRg>EaXuI0qYkOF1?&~rb*TSP!XR?@kdan+^k{3z``ntNTwtjPOui^ZlVBeZ&3{cN& zgHYaQd&g!2i+cMzyE=cd0iL^c$Ikuwl{a7i^;<8$`s=sfc;%H>Uw-YaSASBt=^ep} ztaY{xTi37O0KrsY3ZA-EtFz&$gD(SujjOT* zTMryPdh*24<0lT;j%~<2d~pBK6GxA1fs7=Zz?N0Lza+OrC=m-qWd)*Qp|q$lw?tA@ zoO=|OXE4?Z4iyx`!bl2>my!Z$X^Et`Ag{Poa;UKIfFQeHkW*GvoL?jqON8acC1v7L ziLkIhSbE|_NpUHx9rv%5+is3KHCB;?3a+t~{M+wP_ph%mt`t_uPRV37r>cu~?t+Pvs6rx=iA(w7ZR^s- z(mI)}y1L@P&fIE=t#mbCEXn-32HaIqTwMd9dhxcLa~0CE((Y{X-5zoI`5LjftO`&tlTOzhmMSG>2c^%Q zsjWS6s_J}Ig}6+1szxR%&nT~hmXscsov*Gfua?!-)mDkc)i7xnmsh3@t1GE4Jza42 zjI0ifJ6&5RgW{U%YFVjl8`!i=umDSdqJ5ybEy1E8t&QMx&y7<(Y(qr(*tvn)?@P$>U zPE}V!-K!;%$}>_~b?$0-+623lGvH6Y%5yDYZbLo^+Ei`}^W{fOJi11Om;Jmtk1vvvh!Q zJG6c97fyubm}f2yqb%WS69}~KKsZvLU+{8}CEYrKpv@KFV$pxBLPX6;FbI6td2#A48;VEh2;&F&CNvnn8;>Ny4D27tVO}~!#A1nP zGQvhF`%#-`tDs5k1a_Pu87Z13qbK>3RXi?zSIx4*~Q+im)(KycR7-V4Lb zKuQB|Nwut|WM4UG5%b^0r6sjBholwo0EmwY1ji+!-1D_Xb(Li`vh;VU6aogaI(S;D zr6&MbF0F>HeyT=XU0DhG*OgYDsyzj797%13biGZGwR-1X+n!Z9dv@>Jv-Woag^BOc z?|usjGJ=m`DfRt-e)ZF9A5FL>2^V5_aVgSH4hN@c`bM1daqiia*G1Uxpz(OXMM54>>n80(pw{n3>3}cxwP)Pri`;VzBMh(B?RTWr1{`jdWhTbypvN^u{KHFQ zf;aj`Z;v^~hj`8IN1BOghQ5*DK=a(R&rLdp{D}nY)P@2`{439d6G=R94nbB2_XXh& zIP8uv<-(i@$1xLQEa9}<>9Je?AR7|AUH-|`#H|U(&`kuHA~V`42RZVC+EG|QqVX?X z<1Q@uz&VUEM0k|UXeW`NJs4()J7b~Xl*36nhKHtfw*?np`fPY&6!hP|@lbzgnsQLQ ze&%K(l&QUkat!me_u~i>NPGqQ1BnNYAjnF?W$>H$BvV;>s4 zDY)Ev=g#o>=p6Px|oJ02kLc^*TBZ@~f@Ff{H%e2J)i6mmW$eG{MJQxnjQ05etc z2SM}e0oFArS`3T6rVFHi6pTuWBx>np-40k0?>q?1khLjKsPCbhU^_S z;P$gA?>L!Yhi{JkafI-oQn@Z-nsra4$U< za4=&ekBZPS&Nr8EIB0YdO(ugFO_SWrH|RJ<;d75sUXO!;r8YC|9%T~tf4p<+4{qEY zbUDW+Z{BuKe)O?G-XEZ7&(z3m=fuq^_pQ${-!SELU><4?agbv)pl(K)811_kce;Z< zCzgl>P$oj)sc+HoAm(4T>K2XAJPJh+CgmPunU8-r{OK(m^$>RF$mFdN&xCvPKMCYF z!CUU}kx|#!7nAPcTexqScG@v7J@2!VcOtV~Xeh$ODCFz#xQlSx$?2Hi$3$>{@;h`Q zhzI7O1G034XZgHN8inO~(gzRIM}Hi;;iM1`Zg-7L+_d{fkT-rWP?U_480Q)v9d%9J zp7M;|!I4qg=>Q)tc-4p&8 z#onS(#^Z%#Kxoet5A{M-D9j5HDc|VS=XPWmnfSe6rEP*>2-{fwh{rze0yhSEH#%`2 zGw*YfU*Iv0@`l6H0pEAbB*ePB^lTIh;B+vM{D$%(96jTkK%x|P8xqJoP>KdIcG~Bm z1Ad5HanQq%G2h74A9)YM4|xWaN37> zISg}CbFK*(Nl}+SJ-2U?=qSJ#j9Un}LN}PX5ay$a`#ALt$HM~Ld?-kfF&a&NNBaOa z+_MbxLq4iAL=m1q5_b@!$LoYK)QU{)5csBxUK5f|&68MhupuRK=0?}a#0~j_%)chneg~sU69Ts4uJ;M6E zNI2~B5zu(cFwY(PXOG%!l824n8UmQdJA9k)kF#!gS9}kK{VC!@5f>Vo4Lt#Sdq)oo zFouV*IBt)HP%jdVdZ4dhzChRwAy*dC-5x@n6K?O=Fc0&%2p;BsWZ69w zU`W8{fI%k|WXNU9bUSv^1P_Z$vH=$HI$~i2^M@mD#6AS`gRpZP+UzOV6v;7Dqsy@I z5t6se4T-LcSO$he2Laf3te5aP(9k@j15|*8O=H-fI1i4wkkCRb4GT{H2`$*O zukW7k5e(9v6P$+#h7*okpWO5ZurTD@rD31*ZcO*aDT-Cm$njUO zA=lKT&v)k*85pNAoCJTdUTz9tq$f-!{ODhzfglXRp~Yo4&M5Ze96Yr!=eGka=4Arx z)Tlqf`lw)d#`W9lkgo`^AusOBz{Uc+W<(#)s}Wr=~Kn2^xbSePoXFg{IhraA+(Z zftT-}6BO=r2Ohyb+MRRoux)mhhp`#hcp%QhBGZl!0fq#^k6^CAGR#hKj2&PuyB%tA zo5CjP0O2R%^BfYkvkQ^PNIVqvBY%mYkQa?Z2O$~gAfFz|IdtTRJ)VIjye!7rCwLe` zWndVBfg8QSv}I4gLhKVT61PJlxfgu|3y;P_i6HV_2!)9t5nG6m6qWEx_8mNWtb8V% zb|aT`uow+6Sfy}WEM@=g`*+f?kqqpM@56?`G6WgA4cizY$XfTu7edRHjmEhIjeHq_ z!O#_mL)RzCay4-IIR*Lm2iLHaRkadU)6nY)^3k3R$*{hmFmI zf(dLXhR_tu_ZMd=|2w<)A3lEaWL21=?;(yr6f6s2wAT$b!i*sj^*TPkh2db?Lzo*I z&%hkKWs{?$0Wb8%;X5SZ4FxD)Ah8faBaSp|E=i<ML-0&ILXL4swoB*ppw#&?brc?J2ojY%KCUzlZ(@=p4W*$UphV$Rk*ShoLCEu1K1iA$*YY&LVis=LkST_OR=w2cJm82GW-C zFpmR4Mutcd*19x;0n8tDF2kUMEX|X_P{4Zw-WNLro8@iHlNr0=6n3SeVloZ(@iAi>S!NHmBAU09rVqu)2;2FoV#!0!c;0T&xd!!Ylp*FQEw zfn_*@;)#r9OR;DghTmHtv2gI&bmy=YiVJebQx9SBa0Uj)jzR>*&Jlqa0Wka#>=wX+ z08>1KO=7+&-y@hGPrK0-=3(;*Y8t=4NaEq8QADBSOzXZ@zi2C5L<>NscC|TeURxKg+%~+0r|s6zxjvX5C7(!fBf{5 zPk$f5Ay5l1VuA_*4BCuv2jhqX$9Xs2@&>1P%f$U@H>P2eK6vu~28Irh1cwt-sU5phP_zoVeO~U#{uBAfj~%K1${op&!X)2XKnfCG zB7wMI2@Is$%ML6ZaC1?fGzF*D5OjQsW$-W!-6^#&9gHH8rMZ~>K2N%*U+xxzMYcjg z!9adNUhav?_~JN^31G<(NdpFYV36|@3DlJ_h{q7v?**c#F#hpLz`(&9nw_4X#iO3+ z(p-Gahg~neJ&1^*i8f-xPvD zPvfWrPVxFfRM?YRN==V{ogiq*o&)e|%`doGc#ZGWd9TgQg_9HDBrNSDCb|&t#pwX< zXP_t6m*UR88{LM9cB6+98nxym|jQ$2%ld3^S85eOVf#kZ@*jk_#_+|>o0;$%-sGY zN+%*<6v6S%<0vjN<3$odI5!rLxc&Yh>m5h$JYspcXxQzXoD3ok$ORb=GX4lbF>LCd zpW>gEdps);2`|kAX$WJm^K(qYv6K1mIw*l=`o+I69wre zS=I_L$QA-8woTIuNe>QgoP;*Rv0#b_5a9)gqCNqGRIL$$&RF&kHUhz^0I>|C!~XD- zFf5+nVIkg)3)1~Zpv{1Feldy6O?#18Gy}uG2a9_BesH4)o1p3R3qsNFPPf?voKSW7 zAH%%d_h1X@4gxT2_km+DUKHk+I_E;J=|`{-f#XkDW=CU@Ct$9@|Haf3&odke;7prNazP( z9&Q=t@#A0_O-zRUwDS)4z{9xRi-~*F01GCfOA9o_lTq&2{-Y=Ja^L;7salG@kHIr$PvvJmuXO#EDdx4FfEYBr(`GP2ye__j_DC>?zA!b|<_VN!SYs z!qye6B%?Ev^h988c4jGhKSd|$2MY|F2z~-Hfn&e?HWHr+EzF1Ey*`~{;H2&RGHg0R zbMYmTNI`yUfKCP6FfRm{{UPis-)3Hy%kGBURl*HzHp%)uLwBNc03+rXrk5fBn`Ry? z&}@QuYwy7$#WP>w@nq=!Jt`4F=Vv{B9u`kqHXVhd`%7>pHV6||GKE3V&F^&u+)N;2 z*)q%tS+P89j15k)Xd32V$3qMEl1q`r6f?UFljIya{D*rB{#cS;xED-uf%&-!^l4ah zktUNg1^XVUfCo-}!z&kI{FycbSOTsyaM?X54;$wI=JyWY2``}G@yP7G#8P;Enw_P; z|J1K1U{#%;G&*D?+0>0XAokLu>&jz%n)sgLB)kK?MQufDgi`e(tel%dm`P z9ARf+)pv*cG8mo=&E8KeM(5J7MTU**_vD=Ub20>z_yoOppPIq&`$=yw8J~F)w#1Oh z$1ntSB7Sb!vO#Ys1M^{ijBt%|l$*nl5qQq9kUczmKeZ5=n`P(dFYhsQtZvWA=yxm| zXQyMKr3d6Jz``y#hdiBz1&JB3EblIf2}Pr%%cQ4hfI$qAP9!KDggL!ob+v@^Q!AhqCMm|G$OjDzx)!6gC!vt#U72Ik}4=!Rp^m>-U^!*+-d z&hAeRhrdBNFT3y{IpbTLWl{iRm=~qY%)(NHqG!Uy!oNg=5rX*&Zr_-TC3rVdBsmv@ zBlY0M6r^(d0p=rV!ta9h_#;?20U;H~l%I!9j#EJ&Y^d0W!(UM$6q|jJO4;u{gzX=T zMHcVD!eueeEc{EDgvs4kK|i*@) z2{?71hPeoKoWh}l48YD))CW6ma3CL6w045R;bgr7U<_1!4lHvn%`($0xbenJ6ysqO zSoS1rDVB6302YLeO|Wb!h^9gWK_{ayU4!Io7YeY^G;GipNy8=~Tm+Y0IB}Lq(h<*a z=s_&X5Yqs2EG)yAX}IDc150vX8C=bfwrnZ&BrJNL@~6N|CKYz$7=IH$Usb!^;uuCdY2q==X~!`b&pdWI%EOQ$_DhCKAd$t{xNB*KoBdm`dET zFgMJqoM8^eSq`5F-G}!E3VWm>&x6$8fyKWEBN7x`ATh@{mtjr9yc5y zfPHocRab-)3&!vReRq9$--fhB(*-z#$+UVZ4bT1(gC=9EOqyA@A4m@S`^SQ7{rV4}y^y z#uud@!`=Z{t{p7%dJzx7!yG&;Ml!T7mWItFzKnXmiACnwFYiO}0D>$(#xgR=x_#jp z4vSHbVG4j9yB_5qYB)Tx3}a!D8lnAh9!Ae3zDoGM2}NOwb)S6*BST9GcIltNjZAFW zjm~s$eCS3Z$vW*UysZHi@=ig55#ymw0c_ueC?v3X5#+C7bc{?UzDoMOjs6e}-i-ts ze?UMQRea{}!~P%y*v3kCIElLbupQ-uP28yvhsF6U%;bX^I_8fjzDg}y_JD&cYVgRt z`%x-w*Dq%=fcT<63E0_7N%T}S+IXXM<{ZJ zXQ64<*Bo!yU$bmCvpJd(RZxV6ZA#))R3Pr+*1A|xNAEkRBIVP`Sbee$6 zIq^)3!G$kRvQl6d&!X>t_1AW>c;Y_cj-`@+#bTUJW+ogAr&;(I&itxuR`^ljv6t1_fN0f|aI2)g6E z2cIUzD4&a%4WXfMgbjM}u}{iNw|pXK-YS;#IlUO+n}nUH?~!8jUq=4}(mxXzL>C`G zZpV`(mW_c;F$(h$vz(WUM0wIDb&?Z*6g1^ZDm#!L=0xYej3E4zML&4lP8o}qIfVZy z4vmMu(mRJ`_&g2pwa71Cxe>J@EwJMog3>sku1M39-{r(ifbK!m&0;C;jk@RC3@m zLH!P?xb(%3kx7hl*#Da1TViGsp?_WkhrpKcz55Y@T}nmn|AmBot?7HPs(+di`Z5-s z36m&HJG?eMRAF zGSCkd24y9nx=dOMT8kjjyR1YgE??FPr+-U@B3t=-37odBsE|sls%5sy4YHb=Y5;+S z2jKnm{S<2c`wym83xD=fv%EpqqH1U{cegbeF0^$S^sjXqogwTa)pkuG?sMz3Z{&x0Rh83c1b%n%@D<%8r4Cw_D*}jMtVm z>zdWgN|Vu451N~sTTK_=`1LVJtv>WtOUvbE`NcOikF@KWA8A*ZTDrRwtvWCZv@3OO zN`>`W^W|nu*VTr%{;m#%S}j+oI^JmpYdbUg+Z)pQo6H)eu3m37 zXy0z?G&Hs<4UKPHR9yV!O~EUtFI~O@1i9kPS2dbOcx0O7?Y;UI(Vh%`j%#3yzz=w+hkB^n-$hReT(_B0WL&(vnS2y&M-PVRq%MXX*=F+ zxvW&T*_tjYOl?-4(cDmPQnl!s4Bfg*7vQoSb;~7P!-aaq#ny|zgw*Q2M%CrZ4f1BV zCF_k>wQbGD48_p;h@!H{c}sLn7d2g7aL!V0Fm*votJ~ClO&66Wo%OP=Ro&8f#iWsI z8qB?lHybQgI2ZD|_VR@$)uq;pS6+bB>Sn77Y*98{XjQ%aMh4Ra#-uTQX46|e7G=A< zuU8E|xvc5xHX7k}tM;CEQ<$(S9=-mR8n7ReEkhWYx9-X%V3Y@HAt<#sO?fWUa40$y)D;V zeydGgZ&YctDs!))#eBsGmr%Xc31nqh!QDmX-s{SGIPlt^LA?nmxxCS! zRH{t9@=L~^#$Q}~^JTTZRRdReDK1^nwqAhL>YwUN9cfhaMWya7mF)u_1I)gsrnG`Dqks#HdcUf08;H0rcf&`ueYNu>Z(>t(a~rJr4X^@0iR zENfO?mS1daYu2uV+2f@)O^>Fbp$Yl~??Ju#lBu;BSObbC;{_{RxOJfu9z5lH?e%b} zTa&)GQ>`{y+SJ|e152y6wOm%4jqSiP!X0G>evs;sH@0hk{>r7-TiewNb+h`C;!>-= zL09>E!NmjhW_`E1v9U$fd`Y3HzhKZ@2E+79^Ps%h^g7(R)ZWx#=rE|?Yj0@PDVy|t zof@^VU8n8>n98W@Z)s4&Dc3g*Dx*T#Y*1;`=3aS=Mg7X9D-CT{rLA>sTch%_(r`uh zI?VU0E}1Qzs^-QfP3sk924-1?wU}Pl!{t(~)(oswu2w0Gy&W30$;!i2O)7)l*4m)% zG+1~TTwDje3Sh0xX7v?ii_&COsajjwTGSVKSR=q*ykfMrH#flLZ}J9}w&@~onf#Gu z`mXlQRx1qM%Ij8zyhW}u_I9@=9(0$8h@hd~dPx0p1_wicz? zq|(Zpbd9Pv{pE@9@f;LRWxd}4RBl8WsAJkpt1}qTg|TT-Pbo7E`aHLD6Z1bI@uNJi>5^oYvf@kek~yZOtmHuGOGuHq@)$ zR2b{^T7bQrhBY_9wSEArzi8B6X_vPcH0A+~-13H@$EuNcb`I*)@0%M{29*MC!%}H9 zrvJCS_Y96K%kKQDtINUz2_WH-Nbg?y%$MFfpn&q-UEN&{rciL{y?3yMGVP{^oFTa* zinCHI_rr3ROKGLujgTmYLZTv8WEwnWIdFrroxd(A+=uEM@T?yaz@lXDEk<&wYAlBIJ}aq zEzc)oYmvum`HhFzHXdy$V_-|kToz#j7s6;9n#$6vk8-heBm6jfCk@zYCb<=f?q^mu z*4DzAS~?Pol;TUdXUVnobgHj5i98k26W|(#aLn`gwTfT4@2u~8~4{g zT1_m(2<+NY3NT{E$4imOy^mAThndx7M5AkjS8{-5!>j4&Ry5AQR>RpwCYp#95EJiN za(yF{TAo>4DmWjcP&+{9RwdHWOo{gpAxpb7k+?`$f>7{i9@ms`h%Z)V* zD?^cRzOWivzK=^Pgcdi}LXiidkJnR+2~ua*UV<&;4q+c1z@RLPFp|q5#Py4%62&x8 z_A#qV^xGi@wgTAN>T)sjI3CXxmlp2ci2}B<(1hJR1)E=tt+bRaWY-Ur-OFqeWeC+7 zMx8}a2Zyloi||l)&qqI8I|f@VXIEpfd};Bcn;%Bw(PC(R9m*bt4q?}q(_~EDf<3sK zi7n+qe02{n17-m0wAQ(eA95 zGHZ!wp|)}}_;D;8E=KOJgu-D4w#1n6`f`TANOQFujXn4{6JN;SaVnhK%B<%fWj8Tm z&c{mO(2IN|iWVfdi8dZF4I>qAH)3i1U=y%XI=`BZq!%BAOBqDNEYu&*`0vKUky7mb z24Yh@4By>IFC`PC&RVefFav|Kr3~VZ#|xX;P=UZQ3*}rs5_(Ze#U8Il4q+d6^|DwW zzNn#hL|8@!HXmxjYD+Cx^j;Ho?-XqDI4p{muCm3zwhDy@+fat_h&bounHQg^dbXGrwXTF^Wh`d;|v-2FD^8d-OD7G5jAo>T-nZsip#mJV&P#W zU5anOjH!4yRo+5K(s(&O*@J*w+!w`qXnCWQDK7%{Xdzt6u4i+l^3s*Sy+kxpiZW(o zV2>CxUVn`En*)%phq zJx|a#EQiYZ;{8lCwY(56lc7D*xKj?L(~kkGCnGnz2#YPiFmGr5Q5f+>9zfaZ z<50Pf%Et2ZF$RGi-` z$IG#;N;H#NT&?WXQ+HXtECiHc&s5{7osCD)Vz%@k6G?_PHp+>Z3=1B@*-ZGwF>MEFU?5l@Ka+tA?;7ORL50dV~a)V9hi|(wo@uD zY?Tw0=+0&;mD^a$ZW8BU504BF`S#aisokcshm5jtIg99;_4GPIpBC4{)!0fj6vJTn z2)2q4G3$V(!hkJ6Ss1}w!|~c~K2lyO?37Cj+XS}VNaN{aJ#(Kp2ja;Lvp4Dl7Fxy# ztb7PdWm20-v?SSLI97`-M-E_*n`T@^z?l{d69EshnNSN>h#ta{l^D#JM5DZbmSYgX zX-0-8zsPUI(|{$gk^dn^Na0YVl0{H}?Z_G)vk_4juxL0QUyMD7!$@wW1uHPHl}zMuJhk{RmyNVw#n>S%RgLfNB7SLH z$~ec!D8hr5p2S0m3}DG}zA~SWXAlRenoFj#JIQD{0cG)e98++K#1h8d`IT%2>$q>M zHDQ>vTS=q|>_FLRSUO&CG@YY5su`L3+tpXYay!Ww1B<-`)0}{%mgY~v_A2G2oocEU z-`h#Y?=+pG29{>~{)g{mSYEU-;li*m2fMQ`me<*f(L_Z}~=T^de##A+Td_ zZ@ov*jp)aRCj1JL`o?;pS_xrN_M{N2t`zsmm6odAFuD}t81>O} zxWm{3)&4q5(7T$eHaUo=oZCsoE6HSL9aVLtXq8lz>c)DJ;jCuxM4MV%$YrDDWImRt zKPkn^8qGI0?;GOnkCEGVkX_dy;P2r5$SGezd}IMO@G)zNa)6}c!(|h z^oxaKh@Didn#Aly@+2br`I-I`i1gB3Q3#G?A=}IpyWD&GDh4MG|3#rmZ z?Mb7y^t_tPbGljmh=bi2*#%(8^!f8bZLwvbLONI8jf83$Om<`%@m3u`z#6Fo*^P}7 z16a=ikUkSqv%{5={(!LQ8IaKAp#` z8MJKfCv&xhoy{GBi9i31zxi)|@#T*{dH$O}{k`8krfU7+Cpy{YfNSTimJd5f&zXcDK-pC1UyQ zt*jlLE5jPn|J$Y2W2}0Pu-3p@--uUQtWfq)*Ub>3TqElGN;En%~{dPLR&EI?5px^^@#Mx>l?&F?E%w7Z6}=XFXg){}HZK zs?oMsJ{cykby8O!!-xd7@;Hr<(XWK9e0mbL*xNsdXl#hVKD4s`3?uU+SOfiCX?HzR z%p{gWFT+-EgvtyI%EFj;n$HyCRcJ^-S+2gcTidS#7Oz!ywlg`5cM3b(u3n;S6!mre zll*RVJzgu-mr58N#gYxgM=$NI;{hbG9IjTQv1qJ-@b!<9rS(FNbgml=Z1r&xbMS|- zQl$8lfx(QYVH{?R0%6o|J_&C%Fp_V<;)x?z^6?=ol3h(>OaPev<^e1b*+5Q%ma=jv ze*#u5?`@~DjIs>k0uNP3RKuLo7x~r35iE&z=TKR4HFBVgz$ybES!>ke(P~rKaacMTNt}Sq7swc;2}6^VP8>7ip|Vz;RS#j? zTBgcIhGu{7S+W3F4pZ{YI%}G-_%t3Vz64t&u#e&ToAqdTeIu(KdL24OVxVrQKj5?)O3)|d^%Hpil=Q1 z7@@2hYl~o(BfFNaEHssc5a$lb1qdvQ=l^^mRF9`(ONHm_c(1irZNe($C#bV>B3k^A zSP^6M(r@k7)8(aVBhSFf=>oz@Z6Z`&eLoQ`A%j7}`fWt0im2C%f4kV0Ym7>><$) zf1Ivv)zX#IFk}d*L0LV837}#ld0@tD>J%)M0Br3+3CdE5rMrbsSM#fhJ%j{JeNs<1 z3N4rc{VqnImJo&c7_0|@3LFkHf`kKEcJY@@W@h~aGk zLT_dZ>+@y6(usw8rTxeGrTCMb-M##a2IkZDpX74oWONjd9fNnD?(Al2+hv4y+-l@Q zwaV6V%Rx%{Qf)sGZ={iABDntr-j+bZtt7AuwY%|~^>eSR}lG1|VPBm@j1?7w`t0Yi-OB>NqPyFb2 zlJ$Cie?MCv)1mMRL)6da;BqX7v!3 zP9DNyAp(0`Tq-|#+IUjlZ{!YO98ASTerGRMtEYFLrW%F#&hA2_ejHY)JjtZD5ZW^a z*aid3#tWxmsU*x8S}1297l|^=>z5bHJI^qx-P_D>Wf*0vm}9#A<@RXYdb^R`1uT}>uWcmi)y)&I+zD7J3dd~0ZXMQHGLHLf9&faYc+qgL@L8g~T-|xL zwO3$Z&-W41Q`9~D`S0fQmE3l<@Z@O<2{fLT)^eMb6R@YqeQ``#3d#zZW}V#%F%E)v zEU9=Vzq(M)N72vD1BPjm+8$u(C!6{0%=4!hUvze_{PcM-U#@NDE6?{6n~B8p>}q}o zt`7%6N|zl>@RgtDo3IS(EE7wmBe_tv*m96id1o^o3$3Lx@oau&3GLEt)2MOt^9WO*?um2yVLR8KiDtjbG346^Yg7lBb9oQ2<3LGn~wp@q|-Y{@=?ZB zZ6XUzEW48lrSKvsn%~Hv4LkI?-xIdmBU5Awj$5Aa@)CQ zPqH~BZ~wC=`{i72vy|TZvYafZaxW4Qj6>>=t4Ne`0Ly2#NYj?xMP8m%4ryjW+4@qM zj6nd~-bBdUP%ah2y!KK)8!6%q%>Cl0nMy3V`+Tdh!oZ&I=W>0iXH~$m`Mr8>?}tUq zWfWf^>Bvb~^;tHxg>bN$JYd-ttoGNSkz}}zz zvQTDVPa65XFN=t~TOzP0O=U>Hvkfy=pJig3g>)fT*}@BY1{Th?V7HsfFf2&Ma)t0p zCZF6a7FQk=Kgm`ySt#3FeYOoVLfO*(cIp_clua~Y`z=_q1xrOXOPNdoeKGeJo&+SBdAPPPe4yb{)E9Ea^;UWUMS^J{oM zsm3=5EYgIo&A5wI!RLyVY>xqTZXW8<0w7U1Cw*Gv(xRZPF6c09s$~Fs7 zmP_W#P*&J&Y_HUE<#Z~uQ!SKgd&vx7Il$IS$T^iDuv(;2g0hC(ouweUawX& zn}u3xsq~^++lf}UpH$Xgpz~_N^65&`jK^T%!dCq>Y#XVZihKEu3K9<`HVUg*z(}24 zIe?YXt`Jx`v6U;Q9+h5fmv&>-t!L$pPa3}jRyzqxWwy{m7kBd;Wd@cHzk-bj?U3(;ye31#^(fvo^0Zo-hMEgi|1)*jbO zq0JobZUSo{!1Rl9=(GAaRkoQ8r|Ub#*m2nVfU(x$AhB2?hIeKySUs1|g=-9Kr}3f| z`n*!w%Rhfs%++60XQ$1W+A6N2y31J%P!5$j0qeb0-`S2um=|;hFqkn`C$KzV_0VUf z(v!mT=cSinx$27)9ON`Cy(JJ>c2dy<0%sp8D^!}WdTy)nqOk#G zuYi4t+RxXX8rP06RY#Z|vi>PNt9wQTRx6gOPxINW(&}0nom)K% z*AEvWxmwh~!rBzJyZkhB#Hv;@TZL*iw@X;DU&6|6ewxNyP5sGn*7H(}RZ3NhXdc4F zwQTLdPzPA7p^az7I0*-jTY7!v6lO4kKK-(QH?f3O-E2Hr zt>-J5baodutig@8@@p%(oocaOEY#EC(n|I{b{|$zv)FU_P%>Y{FrgINI7zDQ5)vK) zUm`vGK|a^WHeP^Ke~Gk-#cR2}GRdS?EhI`S4~7RXVionpLH6}f61nKs^5xT{`jby; zuO>bHVJcqFZoWt$tJyJ9p-_EM%r)|eO^)P+^lmxtJcqKEOdLV0Zk z+0I%XPCTIo%Eq(YX1(;APYPuuG{oIh$rPS$m!Ex^$ygdm(^}y-@NiRv55L$% zaz>GTGT?n=9UmGU8)f|jDb!el1B3l|5S1zHUZ=}$^8`G0kJ;t- zxNRP*&tbjdv6yX6r_1N6Iy$^Q@AS0Q>9e}L4olTD?zj3}Zin3&@VOkGD?VS)Cd z<6|R3$fnW#yJs%F)7>ncT^%})Cu@?0iftlq0s7e^g9E6gekR=%xdLQZXDuU0TX#6+?Ehw7&i_cIr zcqp2U-%+8&;UxU4)&nbVNjYEJUq}3ffq4Z%v@Y`>|M-2j#bAmj^c#D{w}mnUwakx;OKxt z#WhGNo|v{N1@x%iVpOvnN`XOOvPh)ri6P{Xl8AXSN~90)I5IWuoEj2g?RJksqUKFb z(F%^7FEUxQ!(5Asl8l{0fa*&erCu_wW{MR^jfchdqgYyCvPwy@3cDGx3>3{`r7DyA zRIw9Gu|^KpZj{SpwvjHZqUNhaYJ+H0qv6p~3MJc7-k2W2^7|bsfl+9-$x!mJ!frtt z94#f(2l-P{wZ+3778&&VUZqsS<8Y12DY;N)u^6Yg4kJRbSUH1}eON`^!Br!Pn}IW^ zMd>mHUxLzw#xdlr()2r9rOTS7ODF{r7r-1-l4j{xZqKHq8a{_htHcyfYd7mgrd%{% zqOb}Fxw=8DqVD4gl?tIoKR!UNo|JETb@@uzMIl3=2Sb26B~dX~PwS22a;AK}T%w%R zI?bvfzT3!`s;olxq;5)p0M+AszEGhM>I|bSt(I?;D}_?CLnShe(>AlV-=!9sL>9YT zu9+NBI*_uD5=te8Y2K7fZT9d+#7Iy)K_T@Vho=_{)f|n>Bp#;RG-7sGgu_!hu4){s zs5u%wU!YWr4F-0fP6q~pxSJg6S20u$t5iveC^vn>QjkU~s1l5|MgR?_wzQ2vNf2=w(uBg7zude7jw)6ZadqBT{-wg`Hbx9>U@2u@- zAI%>Z=_i#_JbfotQM0r@4Ns`li6?bN?vPf?Gf@gLWp--C=5eFlqU(1vdK@x=XmniV zulT0*)gcMx9L4Z}%Je5zw7f3X+ zNxhN7HmD~I3JQ5KoNBR!0S!1PrBQ6P3i$G|ai!C)Gbn|pLA`3qfVfvsBsX|PW3=Bk zIxyPBwNS|QC^qo;G&O)#)ZJ>6TQ3s|H42`=ILxBeqckPeN_B3D&^%#uSoHlixt9=uIzG8+3B6c0H`WO|@XK0({)K$n`9>J)mRj>n@FO01$D z(wIC3xmcuyDictuQImwP#$O2erg0NcESsFxiCkuZl$sJ~T~?V~tyL?`vqG*)q4V%Z zPoO0DL-B;w+<9rDcf_idA%_}I!xb52H1?gWa5YN5PAH;u;&GjcGf1n)%wk@XWoDZl zR{fxrGN`3N!=zX_B|xe}q;Jt75hh`&nk=)iPotnk0-iyReK8)Hz@|LkGs=>BG?ZFu zoKjCIEnMRmhTxqOwAQN?2o-uMS8twT(;C29!ptm_-AZ$;3Ie0iYzPGguLUpzfeE;j zp7!v^q}Y$cz=Q($xm@p+3GMO@gnlx3lrjlr73#Pe>!eZs`5DR3u)*w7i-bsT!ZVmS zEtrN_QD9~vzk!iQV6vd8Dz=JbNVh1XbhJ`pnh^;ogV6;mT2Wz)vL?(U6W~QJ6fGATO#BhXjC{a+49sS=aFGd7C7CwMMO-08d#!RL zvQbIRGjgfIU~&t`Bvup6!1w}vRX$|!%Ee}-6lpuH7L`FFwF&e?3czTXkw2-o*@PmI z*d!OwCjPKdGioLNVep9r78Y(VHQ$Cbn4(z&PlR+kMq);(N(~q#S02H%O4OOqAeSo) z9!h3XDpg#C(;zm>Bo4lQKw+CS837X!7^2jOER@h_<_-~bA4U@pdt3=9e5Xi6f`280u4tpweZ zS2bahNi67=6gH0OI80=b2~FmyArnzHWzzyCw6e?uW>Wa%fRXrd3bR+I)W~d_3B#P4 zQX(Iva7=20>%)wcoNuJ$V#-5t^pG!Acoh>Gxr!dw4=Mq(5M`XEGI$VRqy0@7qfBTc zFqwds_!Wv7z=UF@#ivv1x=yMvYP=bE`R8y;vclJZi2|tTh~i zi4I_>GqZV^W!8?`q0 zxCt#bp=@$MZPa^}lS-+Mo}dR+uYy^4Lx9<30v$yM(9QN++*UZL)Jv2h8KO{W^&8ZB zxdr)9=hTwU4)!haxXf;`a@1PwT^-rts=07t^~vrj2V%|YI0a=(+M<6>$Kq98J1RoZjz0T{53EPF-H2W zx-qjF`N=FkTJ8YMp&$0@j56^xn@-LZs{qp&6c&?Q-qF?5E1B^TnAJ7~7-vLk(+dF$ z@);PEv5|t;I0*+irA%y*H(~m5)WP8*mh3Gm4 zNeTt+2+#y(=l<)5n=tE$wh7Y-^(Kdx`!39=R0niJl%}cd2QM&vFqRi_wu{|o2MmS@WtCb?HGhk9{6}F+yZe&rOuvq;~Wqo?JaSF<4xj}7n z^V`m_bUJN7GohsP#!2I#stGfSri_4L+-X%dVJ3+kZOsW7rKW`*hfGaPNF6ga?CIro zboW+Sl$5pxL@=Y>$}*^oyfLZWtfl2vm$d(#ZoSD6Q1R4K9bjyA6Gk&InM^2gsL-m7 z4p_{9>7*(~*%YHJsFvDgZo5>gpOQFc+-fkXmC6LYbYw)Fu&6VmBh&naw5P zbo6RI8j0 zbBe%*W{fiAHuhluI7es?x|PH^u%Mr1P%z4nu-FD=W|>%QQ_3tFhec}Oag2Z=7rE>- z%;hG^oGOXkJ~m)(!Q26wzWg5%0Wa1DelGs#I z;Xr;m|Rs?kzWuJnX2uwuk?5kiNuU3c7n)VCf9AFKwxDI3=KY-CtCX(23gX(;G zp~+~mi>Mhb56Rw5lV-+@xX<(=ZWBi8jKC}wDN|>sm3e&FHZB$$b#M+=e|12`QduNg z8w0c3@GxSL0;W^zv_UN##cY?Vu4tyza{3rd*M!N%#Egz6%&CQgxTlSjYs%qsn}@F8 zCxyq4Mgn14yNPpD2h{y+C*6WMk6?PGioQY#oq8=TQqKTJ(WWUVb93#)LBu?h+at$= zq*E=iJH`gA7O4|Ai`p}7RJgbfzuPi&#nghCB_bAa4ooBs^lKbCsn$9pom4sPb{4Hc zb0>uv)uve$O3)aD8Ysi4+|0muEtt6pbE(BPC_97&kHO?_rPr_3nx(9!b6|pub;Ycc z>TC?mVP_dNR=^y{IBCA3QvybdnlPi8V`gjI3`{HL0Y*XD0n93M>5xR-1DKoZ^n1)h zv!(;sNYgp0gPH;MGBVxk>;&d&!eoFUWt;hm_85$6!aO{O12Llk^LSe@#*8hPH;BxK zTxWp5%*Y__4QRD8#yJLRU`^bRNV%9s;f@HkYIPrk9k6CKO823#ugRKui6uj?LMHxd zgXfX1vahGR)>Z8kbab=K$4J`Ok<>@3G!naWtlwgly0r$G+B-v29?o%9s+MEa0m7tU zUthgf)YIK%7(!~gLrDw>-6!K1MhhH6(=?x|2~tR9E`S{4Y^zP?)EiM(GiHTL;0$<) z`6yz(R*SJYcoqpbH(8>-Ug5O?qt+^yNF4}8VV>2h+{gkc)?CqY@i1fIT83H>rI>F) z9VsL-H|{!+5zy-O`*j|kJK(bpT_Xrh z(*>S_Ans@RuR8mg^3mU`b=IpYnTt|+RNCX^^IuW^INRn_dv$uf$s4q*++0tex6R3gE(K*(8D1)1F5z3ezQgMu9Wc8Le!Wg-^351&kH8!B z+J>&1>I3^Q*MF>h4D(#v5wnX% z`39?RhPL`9Q4zM08)j;xowPEn1{%<$UO#~ z(d3zvn*Bfp2}0VcexN-TgHI;R!6KJgW&%3w z@9M`Z00nA^zC&{vm|15hFgzRDr>BG-lYCqn2p+&jG)>rQ3nr4fwDRLH+aYZ96ih}s zRlLMNZHXPT=3_9*rIu5cD_o&XuNafO0w!uILua6oIgTl7!MxLU2BtqyHXR&4fc1-M zeZVb{IAKOc8Rftnf*CN2PI(OG;^;sJHRYzPH zWd?=Z7L1b0Uk!5#X+MY5nO@9e>I{ygIR;NY3#PUZn4sy@o zG@D<|Zz)sAo3L4)z=Eu&Dt|zM2t#fQ8tlsOJzRzVBas^>Ct)t4OaikvVH$-CFsp&>RvO0JbvGw00)D_h;~2Yb zQF!%%8Kl_;tcQ&MS;E^IlRseeAHpnp2Qj0e33Dr?8iivT!KGTtT!St$c0GhSH57r_ z^#e||YOF(hd(0$~1^m-)!A*<8qiez7i|AF@SFTYe|Fp(+XvX6(O5#yT)s$lf(X9lG z8BHb@fvFE+E-mHubGz+^0jE|r(4o6EW}Z|7=2cz?OxuE?`KYpV!k~{r=c#pbEvPex z+tq&rvtJ`HnO0?+GpT5ip41s8*iI?~%oE`CIB3A6{T=l5u!SuT1cE;Otn~=ihwhk# zh7B-((B>A|gJzD?1DL^q=vl;!_G=2MSA%Tg=4*J(BF3D6Tik+;x0J~!r&i(ii&=I9 z+os`nx0~F9mLaMd2nNl7c{NZ*+vFHM_V)4KQ#xE4_q5k$<=KLIvCHFb!Q8aQ;JB_; z`&256+;Ck#WfUc(XY?>I zy~a-)EE4_A7R+IA9>IdaLzuYVK@XcL0t*OSY}fRRZ`w3#11xxjHrmCQS<+aYUb)9k zd9N9Llp-)Q!F7AQ0~XqeVTISIMU@d4jmPa92A)ZxF)INxGs@hkvKCCQbfL9^GP4{o z`ntl+wg<2Hr!6ywuQ@;wCdpxO_x zGmFW5pT|95H8_=Wicxlh)*gdFnN#JkH0$gLrdN8rlPsr2Xw}Gi+Vr=04z>$0zhbTh zqb= zEz|5~4=}G)>P2U4pB2rB6FOOVh)BhQRE!QKzt( z<(>}=I*ZbBUC!49ysiN&?NU*c&!jUrZqPcvL2sq#n>1gqv0IfMv32GUHVv3m?xmGp z4~J#c3(YFSaEIY0<&-G>vq8t$4ZG6Mz&aEL+w2viR^xN1Ja=?@jSemR5ll{CM#oLP z%BR!Xw3eGRk5*eP1U5b7!4PCsB5)98Qn^R3@Oq{OjkL%~8wpJAl&T19=!RXzz{Enc z(n?_3fLr7FfHqP_H-QBiWlju8y$nn(^BXm^-ZiHY8C5OVh{t^#=GH4bUh$~Ttngb+ z1g3Op^Z~#|ZaA7Sg;z&0FpZyqndF97!EPyqew#*T34QGp)JB)81)Ei9f@X{{uURJy7Q?hwCyy@E^5GV&EUKu@C2_|$8Ooa8W!-Lgvr#?W`&BtTm~wr6?r*E zz=$^rj$jyq$R?c*c~EBt?5f=~E%5qh&11K$Uk&r0f>9c;RwyyuF!P)QCU%P~(?T!l z&nBBNxiVm&+&<D0yK>cNbgC4#xmgq5 zPy55ih1zEx8MDo~&C`c4k(UM71(rKFr^UiFkCB1- zty3Pem4WHJ8b1TGz6PeGeK!)FY#|t0!RkPQc#n*12wKBnFFHEA|FBLtdxU zZ?ftr&vhu1G-0n&=0iiQGWrS3cU&2sD-3F{r3KR;m{By|{>2$r=al7^PD0yUxF5iB zyOlwcRjm(RgT;kk%~BhPFhkYHJF=q5dDEov5EfcgkJT`v75TZQX>Qj=tbS?h*1YFX zs`U;NW5gDVo^GATWzxx=*A!E9z~?*3(t7BzakPxI&u%2FQR6hL>m96} zKHoX;o?Sxe>?VcBCz^1%7+ps!`#ABAms#%{Xot>4SpHKiqt>MzW9#7^KAUmcAO%a+ z)&AufC*ILoxGI+m6ViU^=JQRZkLkh3Z5qUX69_;uO#_ClFRHM$yMg6Z|abw)7fttbq*aR z&|bHQoi<|tq~YGKw%<78XzS`8(?H29I9`Th#;fO->Z!%So4aEi3)YOh2SrBpl;Wxr zbE8TOP#nEoooB&0+u7YUW_5!T5RD&M&Z!Rwy|Z)H@f&)*U2${PY;q`-j=3u)3^+Vm zqQ{~4Tvu_8RUc=-ZgeB8u%B?=HyMHsjX-nNEi~vc5E8PwyDt6cjQxCfXGgzQiK*4e z0}qEM98gB*)HaLeqks|bgVc6VG@5`%@4KVc*tMQ(3}x~-AQKD zA#eY!Gqy{e9UYy66CVG>afS|^=j^O)bVlpfQ+ItTgIPkkZw3r#Bm?&8_w=+=pnjNhV`Ti$axX6z=7(i0So_V!eJ&$R#K zjOE>qjxHjj6RU{@6P&SezG!Nk&qfMg?ht>7H##imjSLTuO>jk=v57IRfGd!UO$df2 zgyVygRsI-@$Khe|v0!R^lq=`+#oWo^0akBcPgi$u@8#b;bMc+aolNP~uHo*k&MpE1 z4j&;9MrQ{;>TGN4sCK^7-d^o&bd7ZP;?u5f*tfe6Z$0o&Pj3(Y>+9>Sbys`N;e)R8 zKRt8)?B%xh&dyp_8;Uz9v)a+$iCXVM`R#4(0JXO>U)H+L_w?Ybu4?yaS645}>pE6! z5BUWjbzJ;gXWl)B>E&t{?m3)Z>ukeyk}^n{Rs2MXZg1}b1LSkK)Q*k@%I?Kwc2#>X z;yU|SD8ANpw&M~Sq*pDL-Y|yN&zw1T=?ppEIs5KQ$Juw7ugJIOJNgiT>*O)m*Ky%2 zbH>^Bk)=QQPye%1$DjWF$VA6EoN%^7@Q1&6$AAA1*@OT1`0sx_^j-gclK00$tUo%=`$zq4`QujK zY(G2xdV z2Rgn6wRH;q0$lVE=g$NBRp>FinND!$GokQ2|od+yx%ix)0j`Yw)(7cO2rfBszS z8h*(owCIG~*4B=r<5xb~+S)E(x^(dZjLBHxE3Tj^{rrWC%V#t_8=-#X*Ff!j>)^W8e0`pJFH1FxjTo+uPNFOF%_HBhDOFFI9#4UD8zF3U*Ql61w0;?Gl4C2{e8Wi#0cl!edPrZpFekz(6P5}9BEEv zas_sIU_qV^>m|O`LH<;$RVgT$M9AZekFZ%i9hWa%IR7sE;Is)C+h1zy?CB?|yT$S= zU;M{^_S%8a@uu%<{QPJC?57(_iHJLaD3!8ZoiB=ICTN=iFbkTWerVW6WG@O_Kk}EnkWD4?*!$dsj-2cuC_}T z-~-1k0Q`C2`$sq;W$>SV%>uviX@8MdOL=4LK3u^06HbT*@BF2X-holBME&4@|HkEh z{Xh6kJtY`#UBJPBAC`Crt!+oozzA2Si~PS|zqD_0=0Bhnd|W_hThj?i9RPp!{KdAO z{t>QJ|L8BiMWNs1PktYphQ`^w?YIj_YfSLyZO&inVhvA8bu(|o^G;k}!zkmA_jg?; z%>cOz2><-W_CEHwNMrj4Cr*7Mzx=EBuw;FxuLBjpv_p*i%Uy$`0)-{|Mu?{h{l}Qk z7$4|qyKs)V0MhVWZ0{YO!WO;%{M4y$y|d>$iX(($lH1RD3Pzxnc+Z|0N#^#i|NG}hnUb^-iz7uvc9#>INy2j7$X{o)t@ z`r{d+baJq_<09ds=^vbu8-pMH$(vF8a;g8{gEdzS27P;JXeuHGZzwyYu_I~ za(CK>v8_L)bMNIvs?Aw)juw! zgCBqI`rq=K_upIlzxBVj_ut$0=lkw|-nPGQ+g~#NeB1xL?SJ0(KX3b=xBbtXdD?%u z)aLWw+y3`$|NFN8eLMbmJN|k*{(3w9dOQAlJN|lkr1WM!c{~0h?;qZdKi`f&55}Lr z-uF*<|MzQn|8?U1->>ogBYFS(J-`1v@&5JK{{Ff3{{1^&^ZL5Z(Bo>bZq^}!TOt9OaIc{T*5V_WtVs`MN*&jz9n6qiL*v8)&Y- zBP+lAu>Q|^W8pvejybO>?k_^`G498#KO_s#+OhsoZkfHi`l&CuY~S}De=jZ2UspdS>pzEj+sX1nW&vnt-xWDVf20d+9$pJnN19@RzAOhziUbJz4;b1;AK>#8cX?e4P5Oww%2F z@_+9kR=;8ocTYRB{Fm%S#vRbZoh*v5oqY2r^S6Bn={3}g#dl=+Fe&t16G*~gv~sV)AS4~lPW9pqpA8;f^l96HGqmcEibIL%E! z%m#=H*nly_5vwfz>mRNBy;ts!eYK)*@admb?%$rV>!jRK+{ric3_dCB2{_4MaI{(r2fK@Byjtum6U>Dfo9w=e}W&=+D@T5>lJN#Eac<^}p z-}&=@{4)z(_a3yiKrt6^?s7*Di#^VlX-tm5 z)%QMnu=sdA6hZdMWD5C-ztxdSB@&5Pcw=>W;qILqGae*M5OIe4yHDW{_Tb$0bRc#JEOsSReE%j=(>nVp-vcJ=DDZ+Be1Ha9nSWd=s&sP|uvv z!QRex;6XdJ|BURoJx}&+_w^5rPw^#`N~1Rz%{HsuX0tiI-C?sK$AHyL>$OTsBH~Sq z4zar1nH%q=ZJ=Zm7HJ5XD8~cX0LkGCL=tR)L?lw=5Bhco`BSp_Q6l1VC&z}_{XJ;) znES4|_3F_4&0S!m60jEsaW8uMkc5!z0G;A;k=~5Q{dNcba*E5DoJ4xU;X&+!#lAbT z>xu0BJ7In1I>={aG=SYmm)j6*5!W!lBu6|M2jiRm#wL;P3A>Y69@}5Rcom*8LF-Py z#%Jt3CecX9(fg|$2rzVZO- o-Ot$me9GxhfscO0t$<57fBpiFi@)jto5Sj;bw>ITr1jJP5C5bHIsgCw literal 0 HcmV?d00001 diff --git a/atom/atom/mac/helper-info.plist b/atom/atom/mac/helper-info.plist new file mode 100644 index 000000000..4805ce080 --- /dev/null +++ b/atom/atom/mac/helper-info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${EXECUTABLE_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + com.github.atom.helper + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.5.0 + LSUIElement + 1 + NSSupportsAutomaticGraphicsSwitching + + + diff --git a/atom/atom/mac/info.plist b/atom/atom/mac/info.plist new file mode 100644 index 000000000..3b3a3280c --- /dev/null +++ b/atom/atom/mac/info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + atom.icns + CFBundleIdentifier + com.github.atom + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NSMainNibFile + MainMenu + NSPrincipalClass + ClientApplicatoin + + diff --git a/atom/atom/main_mac.mm b/atom/atom/main_mac.mm new file mode 100644 index 000000000..f8871fd98 --- /dev/null +++ b/atom/atom/main_mac.mm @@ -0,0 +1,29 @@ +#import "include/cef_application_mac.h" +#import "atom/cefclient_mac.h" + +int main(int argc, char* argv[]) { + @autoreleasepool { + CefMainArgs mainArgs(argc, argv); + CefRefPtr app; + + int exit_code = CefExecuteProcess(mainArgs, app.get()); + if (exit_code >= 0){ + return exit_code; + } + + NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; + ClientApplication *application = (ClientApplication *)[ClientApplication sharedApplication]; + + NSString *mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"]; + NSNib *mainNib = [[NSNib alloc] initWithNibNamed:mainNibName bundle:[NSBundle mainBundle]]; + [mainNib instantiateNibWithOwner:application topLevelObjects:nil]; // Execute the secondary process, if any. + + [application createWindow]; + + // Run the application message loop. + CefRunMessageLoop(); + } + + // Don't put anything below this line because it won't be executed. + return 0; + } \ No newline at end of file diff --git a/atom/atom/process_helper_mac.cpp b/atom/atom/process_helper_mac.cpp new file mode 100644 index 000000000..2d3c27f7a --- /dev/null +++ b/atom/atom/process_helper_mac.cpp @@ -0,0 +1,7 @@ +#include "include/cef_app.h" + +int main(int argc, char* argv[]) { + CefMainArgs main_args(argc, argv); + CefRefPtr app; + return CefExecuteProcess(main_args, app); // Execute the secondary process. +} diff --git a/atom/atom/res/cefclient.ico b/atom/atom/res/cefclient.ico new file mode 100644 index 0000000000000000000000000000000000000000..d551aa3aaf80adf9b7760e2eb8de95a5c3e53df6 GIT binary patch literal 23558 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 // NOLINT(build/include_order) + +#ifndef NDEBUG +#define ASSERT(condition) if (!(condition)) { assert(false); } +#else +#define ASSERT(condition) ((void)0) +#endif + +#define REQUIRE_UI_THREAD() ASSERT(CefCurrentlyOn(TID_UI)); +#define REQUIRE_IO_THREAD() ASSERT(CefCurrentlyOn(TID_IO)); +#define REQUIRE_FILE_THREAD() ASSERT(CefCurrentlyOn(TID_FILE)); + +#endif // CEF_TESTS_CEFCLIENT_UTIL_H_ diff --git a/build-project.sh b/build-project.sh index 44980bff1..6a66b1047 100755 --- a/build-project.sh +++ b/build-project.sh @@ -1,2 +1,3 @@ rm -rf atom.xcodeproj python tools/gyp/gyp --depth=. atom.gyp + diff --git a/cef/cef_paths.gypi b/cef/cef_paths.gypi new file mode 100644 index 000000000..ca5d06c37 --- /dev/null +++ b/cef/cef_paths.gypi @@ -0,0 +1,363 @@ +# Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +# reserved. Use of this source code is governed by a BSD-style license that +# can be found in the LICENSE file. +# +# --------------------------------------------------------------------------- +# +# This file was generated by the CEF translator tool and should not edited +# by hand. See the translator.README.txt file in the tools directory for +# more information. +# + +{ + 'variables': { + 'autogen_cpp_includes': [ + 'cef/include/cef_app.h', + 'cef/include/cef_browser.h', + 'cef/include/cef_browser_process_handler.h', + 'cef/include/cef_callback.h', + 'cef/include/cef_client.h', + 'cef/include/cef_command_line.h', + 'cef/include/cef_context_menu_handler.h', + 'cef/include/cef_cookie.h', + 'cef/include/cef_display_handler.h', + 'cef/include/cef_dom.h', + 'cef/include/cef_download_handler.h', + 'cef/include/cef_download_item.h', + 'cef/include/cef_focus_handler.h', + 'cef/include/cef_frame.h', + 'cef/include/cef_geolocation_handler.h', + 'cef/include/cef_jsdialog_handler.h', + 'cef/include/cef_keyboard_handler.h', + 'cef/include/cef_life_span_handler.h', + 'cef/include/cef_load_handler.h', + 'cef/include/cef_menu_model.h', + 'cef/include/cef_origin_whitelist.h', + 'cef/include/cef_path_util.h', + 'cef/include/cef_process_message.h', + 'cef/include/cef_process_util.h', + 'cef/include/cef_proxy_handler.h', + 'cef/include/cef_render_process_handler.h', + 'cef/include/cef_request.h', + 'cef/include/cef_request_handler.h', + 'cef/include/cef_resource_bundle_handler.h', + 'cef/include/cef_resource_handler.h', + 'cef/include/cef_response.h', + 'cef/include/cef_scheme.h', + 'cef/include/cef_stream.h', + 'cef/include/cef_string_visitor.h', + 'cef/include/cef_task.h', + 'cef/include/cef_url.h', + 'cef/include/cef_urlrequest.h', + 'cef/include/cef_v8.h', + 'cef/include/cef_values.h', + 'cef/include/cef_web_plugin.h', + 'cef/include/cef_xml_reader.h', + 'cef/include/cef_zip_reader.h', + ], + 'autogen_capi_includes': [ + 'cef/include/capi/cef_app_capi.h', + 'cef/include/capi/cef_browser_capi.h', + 'cef/include/capi/cef_browser_process_handler_capi.h', + 'cef/include/capi/cef_callback_capi.h', + 'cef/include/capi/cef_client_capi.h', + 'cef/include/capi/cef_command_line_capi.h', + 'cef/include/capi/cef_context_menu_handler_capi.h', + 'cef/include/capi/cef_cookie_capi.h', + 'cef/include/capi/cef_display_handler_capi.h', + 'cef/include/capi/cef_dom_capi.h', + 'cef/include/capi/cef_download_handler_capi.h', + 'cef/include/capi/cef_download_item_capi.h', + 'cef/include/capi/cef_focus_handler_capi.h', + 'cef/include/capi/cef_frame_capi.h', + 'cef/include/capi/cef_geolocation_handler_capi.h', + 'cef/include/capi/cef_jsdialog_handler_capi.h', + 'cef/include/capi/cef_keyboard_handler_capi.h', + 'cef/include/capi/cef_life_span_handler_capi.h', + 'cef/include/capi/cef_load_handler_capi.h', + 'cef/include/capi/cef_menu_model_capi.h', + 'cef/include/capi/cef_origin_whitelist_capi.h', + 'cef/include/capi/cef_path_util_capi.h', + 'cef/include/capi/cef_process_message_capi.h', + 'cef/include/capi/cef_process_util_capi.h', + 'cef/include/capi/cef_proxy_handler_capi.h', + 'cef/include/capi/cef_render_process_handler_capi.h', + 'cef/include/capi/cef_request_capi.h', + 'cef/include/capi/cef_request_handler_capi.h', + 'cef/include/capi/cef_resource_bundle_handler_capi.h', + 'cef/include/capi/cef_resource_handler_capi.h', + 'cef/include/capi/cef_response_capi.h', + 'cef/include/capi/cef_scheme_capi.h', + 'cef/include/capi/cef_stream_capi.h', + 'cef/include/capi/cef_string_visitor_capi.h', + 'cef/include/capi/cef_task_capi.h', + 'cef/include/capi/cef_url_capi.h', + 'cef/include/capi/cef_urlrequest_capi.h', + 'cef/include/capi/cef_v8_capi.h', + 'cef/include/capi/cef_values_capi.h', + 'cef/include/capi/cef_web_plugin_capi.h', + 'cef/include/capi/cef_xml_reader_capi.h', + 'cef/include/capi/cef_zip_reader_capi.h', + ], + 'autogen_library_side': [ + 'cef/libcef_dll/ctocpp/app_ctocpp.cc', + 'cef/libcef_dll/ctocpp/app_ctocpp.h', + 'cef/libcef_dll/cpptoc/auth_callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/auth_callback_cpptoc.h', + 'cef/libcef_dll/cpptoc/before_download_callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/before_download_callback_cpptoc.h', + 'cef/libcef_dll/cpptoc/binary_value_cpptoc.cc', + 'cef/libcef_dll/cpptoc/binary_value_cpptoc.h', + 'cef/libcef_dll/cpptoc/browser_cpptoc.cc', + 'cef/libcef_dll/cpptoc/browser_cpptoc.h', + 'cef/libcef_dll/cpptoc/browser_host_cpptoc.cc', + 'cef/libcef_dll/cpptoc/browser_host_cpptoc.h', + 'cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/callback_cpptoc.h', + 'cef/libcef_dll/ctocpp/client_ctocpp.cc', + 'cef/libcef_dll/ctocpp/client_ctocpp.h', + 'cef/libcef_dll/cpptoc/command_line_cpptoc.cc', + 'cef/libcef_dll/cpptoc/command_line_cpptoc.h', + 'cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/context_menu_params_cpptoc.cc', + 'cef/libcef_dll/cpptoc/context_menu_params_cpptoc.h', + 'cef/libcef_dll/cpptoc/cookie_manager_cpptoc.cc', + 'cef/libcef_dll/cpptoc/cookie_manager_cpptoc.h', + 'cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc', + 'cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.h', + 'cef/libcef_dll/cpptoc/domdocument_cpptoc.cc', + 'cef/libcef_dll/cpptoc/domdocument_cpptoc.h', + 'cef/libcef_dll/cpptoc/domevent_cpptoc.cc', + 'cef/libcef_dll/cpptoc/domevent_cpptoc.h', + 'cef/libcef_dll/ctocpp/domevent_listener_ctocpp.cc', + 'cef/libcef_dll/ctocpp/domevent_listener_ctocpp.h', + 'cef/libcef_dll/cpptoc/domnode_cpptoc.cc', + 'cef/libcef_dll/cpptoc/domnode_cpptoc.h', + 'cef/libcef_dll/ctocpp/domvisitor_ctocpp.cc', + 'cef/libcef_dll/ctocpp/domvisitor_ctocpp.h', + 'cef/libcef_dll/cpptoc/dictionary_value_cpptoc.cc', + 'cef/libcef_dll/cpptoc/dictionary_value_cpptoc.h', + 'cef/libcef_dll/ctocpp/display_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/display_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/download_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/download_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/download_item_cpptoc.cc', + 'cef/libcef_dll/cpptoc/download_item_cpptoc.h', + 'cef/libcef_dll/cpptoc/download_item_callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/download_item_callback_cpptoc.h', + 'cef/libcef_dll/ctocpp/focus_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/focus_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/frame_cpptoc.cc', + 'cef/libcef_dll/cpptoc/frame_cpptoc.h', + 'cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.h', + 'cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc', + 'cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h', + 'cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/life_span_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/life_span_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/list_value_cpptoc.cc', + 'cef/libcef_dll/cpptoc/list_value_cpptoc.h', + 'cef/libcef_dll/ctocpp/load_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/load_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/menu_model_cpptoc.cc', + 'cef/libcef_dll/cpptoc/menu_model_cpptoc.h', + 'cef/libcef_dll/cpptoc/post_data_cpptoc.cc', + 'cef/libcef_dll/cpptoc/post_data_cpptoc.h', + 'cef/libcef_dll/cpptoc/post_data_element_cpptoc.cc', + 'cef/libcef_dll/cpptoc/post_data_element_cpptoc.h', + 'cef/libcef_dll/cpptoc/process_message_cpptoc.cc', + 'cef/libcef_dll/cpptoc/process_message_cpptoc.h', + 'cef/libcef_dll/ctocpp/proxy_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/proxy_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/read_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/read_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/render_process_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/render_process_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/request_cpptoc.cc', + 'cef/libcef_dll/cpptoc/request_cpptoc.h', + 'cef/libcef_dll/ctocpp/request_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/request_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h', + 'cef/libcef_dll/ctocpp/resource_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/resource_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/response_cpptoc.cc', + 'cef/libcef_dll/cpptoc/response_cpptoc.h', + 'cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc', + 'cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h', + 'cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc', + 'cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.h', + 'cef/libcef_dll/cpptoc/stream_reader_cpptoc.cc', + 'cef/libcef_dll/cpptoc/stream_reader_cpptoc.h', + 'cef/libcef_dll/cpptoc/stream_writer_cpptoc.cc', + 'cef/libcef_dll/cpptoc/stream_writer_cpptoc.h', + 'cef/libcef_dll/ctocpp/string_visitor_ctocpp.cc', + 'cef/libcef_dll/ctocpp/string_visitor_ctocpp.h', + 'cef/libcef_dll/ctocpp/task_ctocpp.cc', + 'cef/libcef_dll/ctocpp/task_ctocpp.h', + 'cef/libcef_dll/cpptoc/urlrequest_cpptoc.cc', + 'cef/libcef_dll/cpptoc/urlrequest_cpptoc.h', + 'cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc', + 'cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.h', + 'cef/libcef_dll/ctocpp/v8accessor_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8accessor_ctocpp.h', + 'cef/libcef_dll/cpptoc/v8context_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8context_cpptoc.h', + 'cef/libcef_dll/cpptoc/v8exception_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8exception_cpptoc.h', + 'cef/libcef_dll/ctocpp/v8handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/v8value_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8value_cpptoc.h', + 'cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc', + 'cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.h', + 'cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc', + 'cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h', + 'cef/libcef_dll/ctocpp/write_handler_ctocpp.cc', + 'cef/libcef_dll/ctocpp/write_handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/xml_reader_cpptoc.cc', + 'cef/libcef_dll/cpptoc/xml_reader_cpptoc.h', + 'cef/libcef_dll/cpptoc/zip_reader_cpptoc.cc', + 'cef/libcef_dll/cpptoc/zip_reader_cpptoc.h', + ], + 'autogen_client_side': [ + 'cef/libcef_dll/cpptoc/app_cpptoc.cc', + 'cef/libcef_dll/cpptoc/app_cpptoc.h', + 'cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/auth_callback_ctocpp.h', + 'cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h', + 'cef/libcef_dll/ctocpp/binary_value_ctocpp.cc', + 'cef/libcef_dll/ctocpp/binary_value_ctocpp.h', + 'cef/libcef_dll/ctocpp/browser_ctocpp.cc', + 'cef/libcef_dll/ctocpp/browser_ctocpp.h', + 'cef/libcef_dll/ctocpp/browser_host_ctocpp.cc', + 'cef/libcef_dll/ctocpp/browser_host_ctocpp.h', + 'cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/callback_ctocpp.h', + 'cef/libcef_dll/cpptoc/client_cpptoc.cc', + 'cef/libcef_dll/cpptoc/client_cpptoc.h', + 'cef/libcef_dll/ctocpp/command_line_ctocpp.cc', + 'cef/libcef_dll/ctocpp/command_line_ctocpp.h', + 'cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc', + 'cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h', + 'cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc', + 'cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h', + 'cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc', + 'cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h', + 'cef/libcef_dll/ctocpp/domdocument_ctocpp.cc', + 'cef/libcef_dll/ctocpp/domdocument_ctocpp.h', + 'cef/libcef_dll/ctocpp/domevent_ctocpp.cc', + 'cef/libcef_dll/ctocpp/domevent_ctocpp.h', + 'cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc', + 'cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h', + 'cef/libcef_dll/ctocpp/domnode_ctocpp.cc', + 'cef/libcef_dll/ctocpp/domnode_ctocpp.h', + 'cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc', + 'cef/libcef_dll/cpptoc/domvisitor_cpptoc.h', + 'cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc', + 'cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h', + 'cef/libcef_dll/cpptoc/display_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/display_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/download_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/download_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/download_item_ctocpp.cc', + 'cef/libcef_dll/ctocpp/download_item_ctocpp.h', + 'cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h', + 'cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/focus_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/frame_ctocpp.cc', + 'cef/libcef_dll/ctocpp/frame_ctocpp.h', + 'cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.h', + 'cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc', + 'cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h', + 'cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/list_value_ctocpp.cc', + 'cef/libcef_dll/ctocpp/list_value_ctocpp.h', + 'cef/libcef_dll/cpptoc/load_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/load_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/menu_model_ctocpp.cc', + 'cef/libcef_dll/ctocpp/menu_model_ctocpp.h', + 'cef/libcef_dll/ctocpp/post_data_ctocpp.cc', + 'cef/libcef_dll/ctocpp/post_data_ctocpp.h', + 'cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc', + 'cef/libcef_dll/ctocpp/post_data_element_ctocpp.h', + 'cef/libcef_dll/ctocpp/process_message_ctocpp.cc', + 'cef/libcef_dll/ctocpp/process_message_ctocpp.h', + 'cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/read_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/read_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/request_ctocpp.cc', + 'cef/libcef_dll/ctocpp/request_ctocpp.h', + 'cef/libcef_dll/cpptoc/request_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/request_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h', + 'cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/resource_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/response_ctocpp.cc', + 'cef/libcef_dll/ctocpp/response_ctocpp.h', + 'cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc', + 'cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h', + 'cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc', + 'cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.h', + 'cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc', + 'cef/libcef_dll/ctocpp/stream_reader_ctocpp.h', + 'cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc', + 'cef/libcef_dll/ctocpp/stream_writer_ctocpp.h', + 'cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc', + 'cef/libcef_dll/cpptoc/string_visitor_cpptoc.h', + 'cef/libcef_dll/cpptoc/task_cpptoc.cc', + 'cef/libcef_dll/cpptoc/task_cpptoc.h', + 'cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc', + 'cef/libcef_dll/ctocpp/urlrequest_ctocpp.h', + 'cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc', + 'cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h', + 'cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8accessor_cpptoc.h', + 'cef/libcef_dll/ctocpp/v8context_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8context_ctocpp.h', + 'cef/libcef_dll/ctocpp/v8exception_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8exception_ctocpp.h', + 'cef/libcef_dll/cpptoc/v8handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/v8value_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8value_ctocpp.h', + 'cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc', + 'cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h', + 'cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc', + 'cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h', + 'cef/libcef_dll/cpptoc/write_handler_cpptoc.cc', + 'cef/libcef_dll/cpptoc/write_handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc', + 'cef/libcef_dll/ctocpp/xml_reader_ctocpp.h', + 'cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc', + 'cef/libcef_dll/ctocpp/zip_reader_ctocpp.h', + ], + }, +} diff --git a/cef/cef_paths2.gypi b/cef/cef_paths2.gypi new file mode 100644 index 000000000..809bab8a7 --- /dev/null +++ b/cef/cef_paths2.gypi @@ -0,0 +1,175 @@ +# Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights +# reserved. Use of this source code is governed by a BSD-style license that +# can be found in the LICENSE file. + +{ + 'includes': [ + # Bring in the autogenerated source file lists. + 'cef_paths.gypi', + ], + 'variables': { + 'includes_common': [ + 'cef/include/cef_base.h', + 'cef/include/cef_pack_resources.h', + 'cef/include/cef_pack_strings.h', + 'cef/include/cef_runnable.h', + 'cef/include/cef_version.h', + 'cef/include/internal/cef_build.h', + 'cef/include/internal/cef_export.h', + 'cef/include/internal/cef_ptr.h', + 'cef/include/internal/cef_string.h', + 'cef/include/internal/cef_string_list.h', + 'cef/include/internal/cef_string_map.h', + 'cef/include/internal/cef_string_multimap.h', + 'cef/include/internal/cef_string_types.h', + 'cef/include/internal/cef_string_wrappers.h', + 'cef/include/internal/cef_time.h', + 'cef/include/internal/cef_tuple.h', + 'cef/include/internal/cef_types.h', + 'cef/include/internal/cef_types_wrappers.h', + '<@(autogen_cpp_includes)', + ], + 'includes_capi': [ + 'cef/include/capi/cef_base_capi.h', + '<@(autogen_capi_includes)', + ], + 'includes_wrapper': [ + 'cef/include/wrapper/cef_byte_read_handler.h', + 'cef/include/wrapper/cef_stream_resource_handler.h', + 'cef/include/wrapper/cef_xml_object.h', + 'cef/include/wrapper/cef_zip_archive.h', + ], + 'includes_win': [ + 'cef/include/internal/cef_types_win.h', + 'cef/include/internal/cef_win.h', + ], + 'includes_mac': [ + 'cef/include/cef_application_mac.h', + 'cef/include/internal/cef_mac.h', + 'cef/include/internal/cef_types_mac.h', + ], + 'includes_linux': [ + 'cef/include/internal/cef_linux.h', + 'cef/include/internal/cef_types_linux.h', + ], + 'libcef_sources_common': [ + 'cef/libcef_dll/cef_logging.h', + 'cef/libcef_dll/cpptoc/cpptoc.h', + 'cef/libcef_dll/ctocpp/ctocpp.h', + 'cef/libcef_dll/libcef_dll.cc', + 'cef/libcef_dll/libcef_dll2.cc', + 'cef/libcef_dll/resource.h', + 'cef/libcef_dll/transfer_util.cpp', + 'cef/libcef_dll/transfer_util.h', + '<@(autogen_library_side)', + ], + 'libcef_dll_wrapper_sources_common': [ + 'cef/libcef_dll/cef_logging.h', + 'cef/libcef_dll/cpptoc/base_cpptoc.h', + 'cef/libcef_dll/cpptoc/cpptoc.h', + 'cef/libcef_dll/ctocpp/base_ctocpp.h', + 'cef/libcef_dll/ctocpp/ctocpp.h', + 'cef/libcef_dll/transfer_util.cpp', + 'cef/libcef_dll/transfer_util.h', + 'cef/libcef_dll/wrapper/cef_byte_read_handler.cc', + 'cef/libcef_dll/wrapper/cef_stream_resource_handler.cc', + 'cef/libcef_dll/wrapper/cef_xml_object.cc', + 'cef/libcef_dll/wrapper/cef_zip_archive.cc', + 'cef/libcef_dll/wrapper/libcef_dll_wrapper.cc', + 'cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc', + '<@(autogen_client_side)', + ], + 'cefclient_sources_common': [ + 'tests/cefclient/cefclient.cpp', + 'tests/cefclient/cefclient.h', + 'tests/cefclient/binding_test.cpp', + 'tests/cefclient/binding_test.h', + 'tests/cefclient/client_app.cpp', + 'tests/cefclient/client_app.h', + 'tests/cefclient/client_app_delegates.cpp', + 'tests/cefclient/client_handler.cpp', + 'tests/cefclient/client_handler.h', + 'tests/cefclient/client_renderer.cpp', + 'tests/cefclient/client_renderer.h', + 'tests/cefclient/client_switches.cpp', + 'tests/cefclient/client_switches.h', + 'tests/cefclient/dom_test.cpp', + 'tests/cefclient/dom_test.h', + 'tests/cefclient/res/binding.html', + 'tests/cefclient/res/dialogs.html', + 'tests/cefclient/res/domaccess.html', + 'tests/cefclient/res/localstorage.html', + 'tests/cefclient/res/logo.png', + 'tests/cefclient/res/xmlhttprequest.html', + 'tests/cefclient/resource_util.h', + 'tests/cefclient/scheme_test.cpp', + 'tests/cefclient/scheme_test.h', + 'tests/cefclient/string_util.cpp', + 'tests/cefclient/string_util.h', + 'tests/cefclient/util.h', + ], + 'cefclient_sources_win': [ + 'tests/cefclient/cefclient.rc', + 'tests/cefclient/cefclient_win.cpp', + 'tests/cefclient/client_handler_win.cpp', + 'tests/cefclient/resource.h', + 'tests/cefclient/res/cefclient.ico', + 'tests/cefclient/res/logoball.png', + 'tests/cefclient/res/small.ico', + 'tests/cefclient/resource_util_win.cpp', + ], + 'cefclient_sources_mac': [ + 'tests/cefclient/cefclient_mac.mm', + 'tests/cefclient/client_handler_mac.mm', + 'tests/cefclient/resource_util_mac.mm', + ], + 'cefclient_sources_mac_helper': [ + 'tests/cefclient/binding_test.cpp', + 'tests/cefclient/binding_test.h', + 'tests/cefclient/client_app.cpp', + 'tests/cefclient/client_app.h', + 'tests/cefclient/client_app_delegates.cpp', + 'tests/cefclient/client_handler.cpp', + 'tests/cefclient/client_handler.h', + 'tests/cefclient/client_handler_mac.mm', + 'tests/cefclient/client_renderer.cpp', + 'tests/cefclient/client_renderer.h', + 'tests/cefclient/client_switches.cpp', + 'tests/cefclient/client_switches.h', + 'tests/cefclient/dom_test.cpp', + 'tests/cefclient/dom_test.h', + 'tests/cefclient/process_helper_mac.cpp', + 'tests/cefclient/resource_util.h', + 'tests/cefclient/resource_util_mac.mm', + 'tests/cefclient/scheme_test.cpp', + 'tests/cefclient/scheme_test.h', + 'tests/cefclient/string_util.cpp', + 'tests/cefclient/string_util.h', + 'tests/cefclient/util.h', + ], + 'cefclient_bundle_resources_mac': [ + 'tests/cefclient/mac/cefclient.icns', + 'tests/cefclient/mac/English.lproj/InfoPlist.strings', + 'tests/cefclient/mac/English.lproj/MainMenu.xib', + 'tests/cefclient/mac/Info.plist', + 'tests/cefclient/res/binding.html', + 'tests/cefclient/res/dialogs.html', + 'tests/cefclient/res/domaccess.html', + 'tests/cefclient/res/localstorage.html', + 'tests/cefclient/res/logo.png', + 'tests/cefclient/res/xmlhttprequest.html', + ], + 'cefclient_sources_linux': [ + 'tests/cefclient/cefclient_gtk.cpp', + 'tests/cefclient/client_handler_gtk.cpp', + 'tests/cefclient/resource_util_linux.cpp', + ], + 'cefclient_bundle_resources_linux': [ + 'tests/cefclient/res/binding.html', + 'tests/cefclient/res/domaccess.html', + 'tests/cefclient/res/localstorage.html', + 'tests/cefclient/res/logo.png', + 'tests/cefclient/res/xmlhttprequest.html', + ], + }, +} diff --git a/cef_paths.gypi b/cef/frameworks/cef_paths.gypi similarity index 100% rename from cef_paths.gypi rename to cef/frameworks/cef_paths.gypi diff --git a/cef_paths2.gypi b/cef/frameworks/cef_paths2.gypi similarity index 100% rename from cef_paths2.gypi rename to cef/frameworks/cef_paths2.gypi diff --git a/cef/ffmpegsumo.so b/cef/frameworks/ffmpegsumo.so similarity index 100% rename from cef/ffmpegsumo.so rename to cef/frameworks/ffmpegsumo.so diff --git a/cef/libcef.dylib b/cef/frameworks/libcef.dylib similarity index 100% rename from cef/libcef.dylib rename to cef/frameworks/libcef.dylib diff --git a/cef/libcef.dylib.dSYM/Contents/Info.plist b/cef/frameworks/libcef.dylib.dSYM/Contents/Info.plist similarity index 100% rename from cef/libcef.dylib.dSYM/Contents/Info.plist rename to cef/frameworks/libcef.dylib.dSYM/Contents/Info.plist diff --git a/cef/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib b/cef/frameworks/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib similarity index 100% rename from cef/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib rename to cef/frameworks/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib diff --git a/include/capi/cef_app_capi.h b/cef/include/capi/cef_app_capi.h similarity index 100% rename from include/capi/cef_app_capi.h rename to cef/include/capi/cef_app_capi.h diff --git a/include/capi/cef_base_capi.h b/cef/include/capi/cef_base_capi.h similarity index 100% rename from include/capi/cef_base_capi.h rename to cef/include/capi/cef_base_capi.h diff --git a/include/capi/cef_browser_capi.h b/cef/include/capi/cef_browser_capi.h similarity index 100% rename from include/capi/cef_browser_capi.h rename to cef/include/capi/cef_browser_capi.h diff --git a/include/capi/cef_browser_process_handler_capi.h b/cef/include/capi/cef_browser_process_handler_capi.h similarity index 100% rename from include/capi/cef_browser_process_handler_capi.h rename to cef/include/capi/cef_browser_process_handler_capi.h diff --git a/include/capi/cef_callback_capi.h b/cef/include/capi/cef_callback_capi.h similarity index 100% rename from include/capi/cef_callback_capi.h rename to cef/include/capi/cef_callback_capi.h diff --git a/include/capi/cef_client_capi.h b/cef/include/capi/cef_client_capi.h similarity index 100% rename from include/capi/cef_client_capi.h rename to cef/include/capi/cef_client_capi.h diff --git a/include/capi/cef_command_line_capi.h b/cef/include/capi/cef_command_line_capi.h similarity index 100% rename from include/capi/cef_command_line_capi.h rename to cef/include/capi/cef_command_line_capi.h diff --git a/include/capi/cef_context_menu_handler_capi.h b/cef/include/capi/cef_context_menu_handler_capi.h similarity index 100% rename from include/capi/cef_context_menu_handler_capi.h rename to cef/include/capi/cef_context_menu_handler_capi.h diff --git a/include/capi/cef_cookie_capi.h b/cef/include/capi/cef_cookie_capi.h similarity index 100% rename from include/capi/cef_cookie_capi.h rename to cef/include/capi/cef_cookie_capi.h diff --git a/include/capi/cef_display_handler_capi.h b/cef/include/capi/cef_display_handler_capi.h similarity index 100% rename from include/capi/cef_display_handler_capi.h rename to cef/include/capi/cef_display_handler_capi.h diff --git a/include/capi/cef_dom_capi.h b/cef/include/capi/cef_dom_capi.h similarity index 100% rename from include/capi/cef_dom_capi.h rename to cef/include/capi/cef_dom_capi.h diff --git a/include/capi/cef_download_handler_capi.h b/cef/include/capi/cef_download_handler_capi.h similarity index 100% rename from include/capi/cef_download_handler_capi.h rename to cef/include/capi/cef_download_handler_capi.h diff --git a/include/capi/cef_download_item_capi.h b/cef/include/capi/cef_download_item_capi.h similarity index 100% rename from include/capi/cef_download_item_capi.h rename to cef/include/capi/cef_download_item_capi.h diff --git a/include/capi/cef_focus_handler_capi.h b/cef/include/capi/cef_focus_handler_capi.h similarity index 100% rename from include/capi/cef_focus_handler_capi.h rename to cef/include/capi/cef_focus_handler_capi.h diff --git a/include/capi/cef_frame_capi.h b/cef/include/capi/cef_frame_capi.h similarity index 100% rename from include/capi/cef_frame_capi.h rename to cef/include/capi/cef_frame_capi.h diff --git a/include/capi/cef_geolocation_handler_capi.h b/cef/include/capi/cef_geolocation_handler_capi.h similarity index 100% rename from include/capi/cef_geolocation_handler_capi.h rename to cef/include/capi/cef_geolocation_handler_capi.h diff --git a/include/capi/cef_jsdialog_handler_capi.h b/cef/include/capi/cef_jsdialog_handler_capi.h similarity index 100% rename from include/capi/cef_jsdialog_handler_capi.h rename to cef/include/capi/cef_jsdialog_handler_capi.h diff --git a/include/capi/cef_keyboard_handler_capi.h b/cef/include/capi/cef_keyboard_handler_capi.h similarity index 100% rename from include/capi/cef_keyboard_handler_capi.h rename to cef/include/capi/cef_keyboard_handler_capi.h diff --git a/include/capi/cef_life_span_handler_capi.h b/cef/include/capi/cef_life_span_handler_capi.h similarity index 100% rename from include/capi/cef_life_span_handler_capi.h rename to cef/include/capi/cef_life_span_handler_capi.h diff --git a/include/capi/cef_load_handler_capi.h b/cef/include/capi/cef_load_handler_capi.h similarity index 100% rename from include/capi/cef_load_handler_capi.h rename to cef/include/capi/cef_load_handler_capi.h diff --git a/include/capi/cef_menu_model_capi.h b/cef/include/capi/cef_menu_model_capi.h similarity index 100% rename from include/capi/cef_menu_model_capi.h rename to cef/include/capi/cef_menu_model_capi.h diff --git a/include/capi/cef_origin_whitelist_capi.h b/cef/include/capi/cef_origin_whitelist_capi.h similarity index 100% rename from include/capi/cef_origin_whitelist_capi.h rename to cef/include/capi/cef_origin_whitelist_capi.h diff --git a/include/capi/cef_path_util_capi.h b/cef/include/capi/cef_path_util_capi.h similarity index 100% rename from include/capi/cef_path_util_capi.h rename to cef/include/capi/cef_path_util_capi.h diff --git a/include/capi/cef_process_message_capi.h b/cef/include/capi/cef_process_message_capi.h similarity index 100% rename from include/capi/cef_process_message_capi.h rename to cef/include/capi/cef_process_message_capi.h diff --git a/include/capi/cef_process_util_capi.h b/cef/include/capi/cef_process_util_capi.h similarity index 100% rename from include/capi/cef_process_util_capi.h rename to cef/include/capi/cef_process_util_capi.h diff --git a/include/capi/cef_proxy_handler_capi.h b/cef/include/capi/cef_proxy_handler_capi.h similarity index 100% rename from include/capi/cef_proxy_handler_capi.h rename to cef/include/capi/cef_proxy_handler_capi.h diff --git a/include/capi/cef_render_process_handler_capi.h b/cef/include/capi/cef_render_process_handler_capi.h similarity index 100% rename from include/capi/cef_render_process_handler_capi.h rename to cef/include/capi/cef_render_process_handler_capi.h diff --git a/include/capi/cef_request_capi.h b/cef/include/capi/cef_request_capi.h similarity index 100% rename from include/capi/cef_request_capi.h rename to cef/include/capi/cef_request_capi.h diff --git a/include/capi/cef_request_handler_capi.h b/cef/include/capi/cef_request_handler_capi.h similarity index 100% rename from include/capi/cef_request_handler_capi.h rename to cef/include/capi/cef_request_handler_capi.h diff --git a/include/capi/cef_resource_bundle_handler_capi.h b/cef/include/capi/cef_resource_bundle_handler_capi.h similarity index 100% rename from include/capi/cef_resource_bundle_handler_capi.h rename to cef/include/capi/cef_resource_bundle_handler_capi.h diff --git a/include/capi/cef_resource_handler_capi.h b/cef/include/capi/cef_resource_handler_capi.h similarity index 100% rename from include/capi/cef_resource_handler_capi.h rename to cef/include/capi/cef_resource_handler_capi.h diff --git a/include/capi/cef_response_capi.h b/cef/include/capi/cef_response_capi.h similarity index 100% rename from include/capi/cef_response_capi.h rename to cef/include/capi/cef_response_capi.h diff --git a/include/capi/cef_scheme_capi.h b/cef/include/capi/cef_scheme_capi.h similarity index 100% rename from include/capi/cef_scheme_capi.h rename to cef/include/capi/cef_scheme_capi.h diff --git a/include/capi/cef_stream_capi.h b/cef/include/capi/cef_stream_capi.h similarity index 100% rename from include/capi/cef_stream_capi.h rename to cef/include/capi/cef_stream_capi.h diff --git a/include/capi/cef_string_visitor_capi.h b/cef/include/capi/cef_string_visitor_capi.h similarity index 100% rename from include/capi/cef_string_visitor_capi.h rename to cef/include/capi/cef_string_visitor_capi.h diff --git a/include/capi/cef_task_capi.h b/cef/include/capi/cef_task_capi.h similarity index 100% rename from include/capi/cef_task_capi.h rename to cef/include/capi/cef_task_capi.h diff --git a/include/capi/cef_url_capi.h b/cef/include/capi/cef_url_capi.h similarity index 100% rename from include/capi/cef_url_capi.h rename to cef/include/capi/cef_url_capi.h diff --git a/include/capi/cef_urlrequest_capi.h b/cef/include/capi/cef_urlrequest_capi.h similarity index 100% rename from include/capi/cef_urlrequest_capi.h rename to cef/include/capi/cef_urlrequest_capi.h diff --git a/include/capi/cef_v8_capi.h b/cef/include/capi/cef_v8_capi.h similarity index 100% rename from include/capi/cef_v8_capi.h rename to cef/include/capi/cef_v8_capi.h diff --git a/include/capi/cef_values_capi.h b/cef/include/capi/cef_values_capi.h similarity index 100% rename from include/capi/cef_values_capi.h rename to cef/include/capi/cef_values_capi.h diff --git a/include/capi/cef_web_plugin_capi.h b/cef/include/capi/cef_web_plugin_capi.h similarity index 100% rename from include/capi/cef_web_plugin_capi.h rename to cef/include/capi/cef_web_plugin_capi.h diff --git a/include/capi/cef_xml_reader_capi.h b/cef/include/capi/cef_xml_reader_capi.h similarity index 100% rename from include/capi/cef_xml_reader_capi.h rename to cef/include/capi/cef_xml_reader_capi.h diff --git a/include/capi/cef_zip_reader_capi.h b/cef/include/capi/cef_zip_reader_capi.h similarity index 100% rename from include/capi/cef_zip_reader_capi.h rename to cef/include/capi/cef_zip_reader_capi.h diff --git a/include/cef_app.h b/cef/include/cef_app.h similarity index 100% rename from include/cef_app.h rename to cef/include/cef_app.h diff --git a/include/cef_application_mac.h b/cef/include/cef_application_mac.h similarity index 100% rename from include/cef_application_mac.h rename to cef/include/cef_application_mac.h diff --git a/include/cef_base.h b/cef/include/cef_base.h similarity index 100% rename from include/cef_base.h rename to cef/include/cef_base.h diff --git a/include/cef_browser.h b/cef/include/cef_browser.h similarity index 100% rename from include/cef_browser.h rename to cef/include/cef_browser.h diff --git a/include/cef_browser_process_handler.h b/cef/include/cef_browser_process_handler.h similarity index 100% rename from include/cef_browser_process_handler.h rename to cef/include/cef_browser_process_handler.h diff --git a/include/cef_callback.h b/cef/include/cef_callback.h similarity index 100% rename from include/cef_callback.h rename to cef/include/cef_callback.h diff --git a/include/cef_client.h b/cef/include/cef_client.h similarity index 100% rename from include/cef_client.h rename to cef/include/cef_client.h diff --git a/include/cef_command_line.h b/cef/include/cef_command_line.h similarity index 100% rename from include/cef_command_line.h rename to cef/include/cef_command_line.h diff --git a/include/cef_context_menu_handler.h b/cef/include/cef_context_menu_handler.h similarity index 100% rename from include/cef_context_menu_handler.h rename to cef/include/cef_context_menu_handler.h diff --git a/include/cef_cookie.h b/cef/include/cef_cookie.h similarity index 100% rename from include/cef_cookie.h rename to cef/include/cef_cookie.h diff --git a/include/cef_display_handler.h b/cef/include/cef_display_handler.h similarity index 100% rename from include/cef_display_handler.h rename to cef/include/cef_display_handler.h diff --git a/include/cef_dom.h b/cef/include/cef_dom.h similarity index 100% rename from include/cef_dom.h rename to cef/include/cef_dom.h diff --git a/include/cef_download_handler.h b/cef/include/cef_download_handler.h similarity index 100% rename from include/cef_download_handler.h rename to cef/include/cef_download_handler.h diff --git a/include/cef_download_item.h b/cef/include/cef_download_item.h similarity index 100% rename from include/cef_download_item.h rename to cef/include/cef_download_item.h diff --git a/include/cef_focus_handler.h b/cef/include/cef_focus_handler.h similarity index 100% rename from include/cef_focus_handler.h rename to cef/include/cef_focus_handler.h diff --git a/include/cef_frame.h b/cef/include/cef_frame.h similarity index 100% rename from include/cef_frame.h rename to cef/include/cef_frame.h diff --git a/include/cef_geolocation_handler.h b/cef/include/cef_geolocation_handler.h similarity index 100% rename from include/cef_geolocation_handler.h rename to cef/include/cef_geolocation_handler.h diff --git a/include/cef_jsdialog_handler.h b/cef/include/cef_jsdialog_handler.h similarity index 100% rename from include/cef_jsdialog_handler.h rename to cef/include/cef_jsdialog_handler.h diff --git a/include/cef_keyboard_handler.h b/cef/include/cef_keyboard_handler.h similarity index 100% rename from include/cef_keyboard_handler.h rename to cef/include/cef_keyboard_handler.h diff --git a/include/cef_life_span_handler.h b/cef/include/cef_life_span_handler.h similarity index 100% rename from include/cef_life_span_handler.h rename to cef/include/cef_life_span_handler.h diff --git a/include/cef_load_handler.h b/cef/include/cef_load_handler.h similarity index 100% rename from include/cef_load_handler.h rename to cef/include/cef_load_handler.h diff --git a/include/cef_menu_model.h b/cef/include/cef_menu_model.h similarity index 100% rename from include/cef_menu_model.h rename to cef/include/cef_menu_model.h diff --git a/include/cef_origin_whitelist.h b/cef/include/cef_origin_whitelist.h similarity index 100% rename from include/cef_origin_whitelist.h rename to cef/include/cef_origin_whitelist.h diff --git a/include/cef_pack_resources.h b/cef/include/cef_pack_resources.h similarity index 100% rename from include/cef_pack_resources.h rename to cef/include/cef_pack_resources.h diff --git a/include/cef_pack_strings.h b/cef/include/cef_pack_strings.h similarity index 100% rename from include/cef_pack_strings.h rename to cef/include/cef_pack_strings.h diff --git a/include/cef_path_util.h b/cef/include/cef_path_util.h similarity index 100% rename from include/cef_path_util.h rename to cef/include/cef_path_util.h diff --git a/include/cef_process_message.h b/cef/include/cef_process_message.h similarity index 100% rename from include/cef_process_message.h rename to cef/include/cef_process_message.h diff --git a/include/cef_process_util.h b/cef/include/cef_process_util.h similarity index 100% rename from include/cef_process_util.h rename to cef/include/cef_process_util.h diff --git a/include/cef_proxy_handler.h b/cef/include/cef_proxy_handler.h similarity index 100% rename from include/cef_proxy_handler.h rename to cef/include/cef_proxy_handler.h diff --git a/include/cef_render_process_handler.h b/cef/include/cef_render_process_handler.h similarity index 100% rename from include/cef_render_process_handler.h rename to cef/include/cef_render_process_handler.h diff --git a/include/cef_request.h b/cef/include/cef_request.h similarity index 100% rename from include/cef_request.h rename to cef/include/cef_request.h diff --git a/include/cef_request_handler.h b/cef/include/cef_request_handler.h similarity index 100% rename from include/cef_request_handler.h rename to cef/include/cef_request_handler.h diff --git a/include/cef_resource_bundle_handler.h b/cef/include/cef_resource_bundle_handler.h similarity index 100% rename from include/cef_resource_bundle_handler.h rename to cef/include/cef_resource_bundle_handler.h diff --git a/include/cef_resource_handler.h b/cef/include/cef_resource_handler.h similarity index 100% rename from include/cef_resource_handler.h rename to cef/include/cef_resource_handler.h diff --git a/include/cef_response.h b/cef/include/cef_response.h similarity index 100% rename from include/cef_response.h rename to cef/include/cef_response.h diff --git a/include/cef_runnable.h b/cef/include/cef_runnable.h similarity index 100% rename from include/cef_runnable.h rename to cef/include/cef_runnable.h diff --git a/include/cef_scheme.h b/cef/include/cef_scheme.h similarity index 100% rename from include/cef_scheme.h rename to cef/include/cef_scheme.h diff --git a/include/cef_stream.h b/cef/include/cef_stream.h similarity index 100% rename from include/cef_stream.h rename to cef/include/cef_stream.h diff --git a/include/cef_string_visitor.h b/cef/include/cef_string_visitor.h similarity index 100% rename from include/cef_string_visitor.h rename to cef/include/cef_string_visitor.h diff --git a/include/cef_task.h b/cef/include/cef_task.h similarity index 100% rename from include/cef_task.h rename to cef/include/cef_task.h diff --git a/include/cef_url.h b/cef/include/cef_url.h similarity index 100% rename from include/cef_url.h rename to cef/include/cef_url.h diff --git a/include/cef_urlrequest.h b/cef/include/cef_urlrequest.h similarity index 100% rename from include/cef_urlrequest.h rename to cef/include/cef_urlrequest.h diff --git a/include/cef_v8.h b/cef/include/cef_v8.h similarity index 100% rename from include/cef_v8.h rename to cef/include/cef_v8.h diff --git a/include/cef_values.h b/cef/include/cef_values.h similarity index 100% rename from include/cef_values.h rename to cef/include/cef_values.h diff --git a/include/cef_version.h b/cef/include/cef_version.h similarity index 100% rename from include/cef_version.h rename to cef/include/cef_version.h diff --git a/include/cef_web_plugin.h b/cef/include/cef_web_plugin.h similarity index 100% rename from include/cef_web_plugin.h rename to cef/include/cef_web_plugin.h diff --git a/include/cef_xml_reader.h b/cef/include/cef_xml_reader.h similarity index 100% rename from include/cef_xml_reader.h rename to cef/include/cef_xml_reader.h diff --git a/include/cef_zip_reader.h b/cef/include/cef_zip_reader.h similarity index 100% rename from include/cef_zip_reader.h rename to cef/include/cef_zip_reader.h diff --git a/include/internal/cef_build.h b/cef/include/internal/cef_build.h similarity index 100% rename from include/internal/cef_build.h rename to cef/include/internal/cef_build.h diff --git a/include/internal/cef_export.h b/cef/include/internal/cef_export.h similarity index 100% rename from include/internal/cef_export.h rename to cef/include/internal/cef_export.h diff --git a/include/internal/cef_linux.h b/cef/include/internal/cef_linux.h similarity index 100% rename from include/internal/cef_linux.h rename to cef/include/internal/cef_linux.h diff --git a/include/internal/cef_mac.h b/cef/include/internal/cef_mac.h similarity index 100% rename from include/internal/cef_mac.h rename to cef/include/internal/cef_mac.h diff --git a/include/internal/cef_ptr.h b/cef/include/internal/cef_ptr.h similarity index 100% rename from include/internal/cef_ptr.h rename to cef/include/internal/cef_ptr.h diff --git a/include/internal/cef_string.h b/cef/include/internal/cef_string.h similarity index 100% rename from include/internal/cef_string.h rename to cef/include/internal/cef_string.h diff --git a/include/internal/cef_string_list.h b/cef/include/internal/cef_string_list.h similarity index 100% rename from include/internal/cef_string_list.h rename to cef/include/internal/cef_string_list.h diff --git a/include/internal/cef_string_map.h b/cef/include/internal/cef_string_map.h similarity index 100% rename from include/internal/cef_string_map.h rename to cef/include/internal/cef_string_map.h diff --git a/include/internal/cef_string_multimap.h b/cef/include/internal/cef_string_multimap.h similarity index 100% rename from include/internal/cef_string_multimap.h rename to cef/include/internal/cef_string_multimap.h diff --git a/include/internal/cef_string_types.h b/cef/include/internal/cef_string_types.h similarity index 100% rename from include/internal/cef_string_types.h rename to cef/include/internal/cef_string_types.h diff --git a/include/internal/cef_string_wrappers.h b/cef/include/internal/cef_string_wrappers.h similarity index 100% rename from include/internal/cef_string_wrappers.h rename to cef/include/internal/cef_string_wrappers.h diff --git a/include/internal/cef_time.h b/cef/include/internal/cef_time.h similarity index 100% rename from include/internal/cef_time.h rename to cef/include/internal/cef_time.h diff --git a/include/internal/cef_tuple.h b/cef/include/internal/cef_tuple.h similarity index 100% rename from include/internal/cef_tuple.h rename to cef/include/internal/cef_tuple.h diff --git a/include/internal/cef_types.h b/cef/include/internal/cef_types.h similarity index 100% rename from include/internal/cef_types.h rename to cef/include/internal/cef_types.h diff --git a/include/internal/cef_types_linux.h b/cef/include/internal/cef_types_linux.h similarity index 100% rename from include/internal/cef_types_linux.h rename to cef/include/internal/cef_types_linux.h diff --git a/include/internal/cef_types_mac.h b/cef/include/internal/cef_types_mac.h similarity index 100% rename from include/internal/cef_types_mac.h rename to cef/include/internal/cef_types_mac.h diff --git a/include/internal/cef_types_win.h b/cef/include/internal/cef_types_win.h similarity index 100% rename from include/internal/cef_types_win.h rename to cef/include/internal/cef_types_win.h diff --git a/include/internal/cef_types_wrappers.h b/cef/include/internal/cef_types_wrappers.h similarity index 100% rename from include/internal/cef_types_wrappers.h rename to cef/include/internal/cef_types_wrappers.h diff --git a/include/internal/cef_win.h b/cef/include/internal/cef_win.h similarity index 100% rename from include/internal/cef_win.h rename to cef/include/internal/cef_win.h diff --git a/include/wrapper/cef_byte_read_handler.h b/cef/include/wrapper/cef_byte_read_handler.h similarity index 100% rename from include/wrapper/cef_byte_read_handler.h rename to cef/include/wrapper/cef_byte_read_handler.h diff --git a/include/wrapper/cef_stream_resource_handler.h b/cef/include/wrapper/cef_stream_resource_handler.h similarity index 100% rename from include/wrapper/cef_stream_resource_handler.h rename to cef/include/wrapper/cef_stream_resource_handler.h diff --git a/include/wrapper/cef_xml_object.h b/cef/include/wrapper/cef_xml_object.h similarity index 100% rename from include/wrapper/cef_xml_object.h rename to cef/include/wrapper/cef_xml_object.h diff --git a/include/wrapper/cef_zip_archive.h b/cef/include/wrapper/cef_zip_archive.h similarity index 100% rename from include/wrapper/cef_zip_archive.h rename to cef/include/wrapper/cef_zip_archive.h diff --git a/libcef_dll/cef_logging.h b/cef/libcef_dll/cef_logging.h similarity index 100% rename from libcef_dll/cef_logging.h rename to cef/libcef_dll/cef_logging.h diff --git a/libcef_dll/cpptoc/app_cpptoc.cc b/cef/libcef_dll/cpptoc/app_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/app_cpptoc.cc rename to cef/libcef_dll/cpptoc/app_cpptoc.cc diff --git a/libcef_dll/cpptoc/app_cpptoc.h b/cef/libcef_dll/cpptoc/app_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/app_cpptoc.h rename to cef/libcef_dll/cpptoc/app_cpptoc.h diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/auth_callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/auth_callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/auth_callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.h b/cef/libcef_dll/cpptoc/auth_callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/auth_callback_cpptoc.h rename to cef/libcef_dll/cpptoc/auth_callback_cpptoc.h diff --git a/libcef_dll/cpptoc/base_cpptoc.h b/cef/libcef_dll/cpptoc/base_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/base_cpptoc.h rename to cef/libcef_dll/cpptoc/base_cpptoc.h diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/before_download_callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/before_download_callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/before_download_callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.h b/cef/libcef_dll/cpptoc/before_download_callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/before_download_callback_cpptoc.h rename to cef/libcef_dll/cpptoc/before_download_callback_cpptoc.h diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.cc b/cef/libcef_dll/cpptoc/binary_value_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/binary_value_cpptoc.cc rename to cef/libcef_dll/cpptoc/binary_value_cpptoc.cc diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.h b/cef/libcef_dll/cpptoc/binary_value_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/binary_value_cpptoc.h rename to cef/libcef_dll/cpptoc/binary_value_cpptoc.h diff --git a/libcef_dll/cpptoc/browser_cpptoc.cc b/cef/libcef_dll/cpptoc/browser_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/browser_cpptoc.cc rename to cef/libcef_dll/cpptoc/browser_cpptoc.cc diff --git a/libcef_dll/cpptoc/browser_cpptoc.h b/cef/libcef_dll/cpptoc/browser_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/browser_cpptoc.h rename to cef/libcef_dll/cpptoc/browser_cpptoc.h diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.cc b/cef/libcef_dll/cpptoc/browser_host_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/browser_host_cpptoc.cc rename to cef/libcef_dll/cpptoc/browser_host_cpptoc.cc diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.h b/cef/libcef_dll/cpptoc/browser_host_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/browser_host_cpptoc.h rename to cef/libcef_dll/cpptoc/browser_host_cpptoc.h diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/browser_process_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h b/cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/browser_process_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/browser_process_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/callback_cpptoc.cc b/cef/libcef_dll/cpptoc/callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/callback_cpptoc.h b/cef/libcef_dll/cpptoc/callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/callback_cpptoc.h rename to cef/libcef_dll/cpptoc/callback_cpptoc.h diff --git a/libcef_dll/cpptoc/client_cpptoc.cc b/cef/libcef_dll/cpptoc/client_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/client_cpptoc.cc rename to cef/libcef_dll/cpptoc/client_cpptoc.cc diff --git a/libcef_dll/cpptoc/client_cpptoc.h b/cef/libcef_dll/cpptoc/client_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/client_cpptoc.h rename to cef/libcef_dll/cpptoc/client_cpptoc.h diff --git a/libcef_dll/cpptoc/command_line_cpptoc.cc b/cef/libcef_dll/cpptoc/command_line_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/command_line_cpptoc.cc rename to cef/libcef_dll/cpptoc/command_line_cpptoc.cc diff --git a/libcef_dll/cpptoc/command_line_cpptoc.h b/cef/libcef_dll/cpptoc/command_line_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/command_line_cpptoc.h rename to cef/libcef_dll/cpptoc/command_line_cpptoc.h diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/context_menu_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.h b/cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/context_menu_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/context_menu_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/context_menu_params_cpptoc.cc b/cef/libcef_dll/cpptoc/context_menu_params_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/context_menu_params_cpptoc.cc rename to cef/libcef_dll/cpptoc/context_menu_params_cpptoc.cc diff --git a/libcef_dll/cpptoc/context_menu_params_cpptoc.h b/cef/libcef_dll/cpptoc/context_menu_params_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/context_menu_params_cpptoc.h rename to cef/libcef_dll/cpptoc/context_menu_params_cpptoc.h diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc b/cef/libcef_dll/cpptoc/cookie_manager_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/cookie_manager_cpptoc.cc rename to cef/libcef_dll/cpptoc/cookie_manager_cpptoc.cc diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.h b/cef/libcef_dll/cpptoc/cookie_manager_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/cookie_manager_cpptoc.h rename to cef/libcef_dll/cpptoc/cookie_manager_cpptoc.h diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/cookie_visitor_cpptoc.cc rename to cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/cookie_visitor_cpptoc.h rename to cef/libcef_dll/cpptoc/cookie_visitor_cpptoc.h diff --git a/libcef_dll/cpptoc/cpptoc.h b/cef/libcef_dll/cpptoc/cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/cpptoc.h rename to cef/libcef_dll/cpptoc/cpptoc.h diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc b/cef/libcef_dll/cpptoc/dictionary_value_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/dictionary_value_cpptoc.cc rename to cef/libcef_dll/cpptoc/dictionary_value_cpptoc.cc diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.h b/cef/libcef_dll/cpptoc/dictionary_value_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/dictionary_value_cpptoc.h rename to cef/libcef_dll/cpptoc/dictionary_value_cpptoc.h diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/display_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/display_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.h b/cef/libcef_dll/cpptoc/display_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/display_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/display_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.cc b/cef/libcef_dll/cpptoc/domdocument_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/domdocument_cpptoc.cc rename to cef/libcef_dll/cpptoc/domdocument_cpptoc.cc diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.h b/cef/libcef_dll/cpptoc/domdocument_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/domdocument_cpptoc.h rename to cef/libcef_dll/cpptoc/domdocument_cpptoc.h diff --git a/libcef_dll/cpptoc/domevent_cpptoc.cc b/cef/libcef_dll/cpptoc/domevent_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/domevent_cpptoc.cc rename to cef/libcef_dll/cpptoc/domevent_cpptoc.cc diff --git a/libcef_dll/cpptoc/domevent_cpptoc.h b/cef/libcef_dll/cpptoc/domevent_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/domevent_cpptoc.h rename to cef/libcef_dll/cpptoc/domevent_cpptoc.h diff --git a/libcef_dll/cpptoc/domevent_listener_cpptoc.cc b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/domevent_listener_cpptoc.cc rename to cef/libcef_dll/cpptoc/domevent_listener_cpptoc.cc diff --git a/libcef_dll/cpptoc/domevent_listener_cpptoc.h b/cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/domevent_listener_cpptoc.h rename to cef/libcef_dll/cpptoc/domevent_listener_cpptoc.h diff --git a/libcef_dll/cpptoc/domnode_cpptoc.cc b/cef/libcef_dll/cpptoc/domnode_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/domnode_cpptoc.cc rename to cef/libcef_dll/cpptoc/domnode_cpptoc.cc diff --git a/libcef_dll/cpptoc/domnode_cpptoc.h b/cef/libcef_dll/cpptoc/domnode_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/domnode_cpptoc.h rename to cef/libcef_dll/cpptoc/domnode_cpptoc.h diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/domvisitor_cpptoc.cc rename to cef/libcef_dll/cpptoc/domvisitor_cpptoc.cc diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.h b/cef/libcef_dll/cpptoc/domvisitor_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/domvisitor_cpptoc.h rename to cef/libcef_dll/cpptoc/domvisitor_cpptoc.h diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/download_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/download_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/download_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.h b/cef/libcef_dll/cpptoc/download_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/download_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/download_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/download_item_callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/download_item_callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/download_item_callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.h b/cef/libcef_dll/cpptoc/download_item_callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/download_item_callback_cpptoc.h rename to cef/libcef_dll/cpptoc/download_item_callback_cpptoc.h diff --git a/libcef_dll/cpptoc/download_item_cpptoc.cc b/cef/libcef_dll/cpptoc/download_item_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/download_item_cpptoc.cc rename to cef/libcef_dll/cpptoc/download_item_cpptoc.cc diff --git a/libcef_dll/cpptoc/download_item_cpptoc.h b/cef/libcef_dll/cpptoc/download_item_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/download_item_cpptoc.h rename to cef/libcef_dll/cpptoc/download_item_cpptoc.h diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/focus_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/focus_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.h b/cef/libcef_dll/cpptoc/focus_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/focus_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/focus_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/frame_cpptoc.cc b/cef/libcef_dll/cpptoc/frame_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/frame_cpptoc.cc rename to cef/libcef_dll/cpptoc/frame_cpptoc.cc diff --git a/libcef_dll/cpptoc/frame_cpptoc.h b/cef/libcef_dll/cpptoc/frame_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/frame_cpptoc.h rename to cef/libcef_dll/cpptoc/frame_cpptoc.h diff --git a/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/geolocation_callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/geolocation_callback_cpptoc.h b/cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/geolocation_callback_cpptoc.h rename to cef/libcef_dll/cpptoc/geolocation_callback_cpptoc.h diff --git a/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/geolocation_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/geolocation_handler_cpptoc.h b/cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/geolocation_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/geolocation_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc b/cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc rename to cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h b/cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/jsdialog_callback_cpptoc.h rename to cef/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/jsdialog_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/keyboard_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h b/cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/keyboard_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/keyboard_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/life_span_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/life_span_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/life_span_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/life_span_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/list_value_cpptoc.cc b/cef/libcef_dll/cpptoc/list_value_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/list_value_cpptoc.cc rename to cef/libcef_dll/cpptoc/list_value_cpptoc.cc diff --git a/libcef_dll/cpptoc/list_value_cpptoc.h b/cef/libcef_dll/cpptoc/list_value_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/list_value_cpptoc.h rename to cef/libcef_dll/cpptoc/list_value_cpptoc.h diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/load_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/load_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/load_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.h b/cef/libcef_dll/cpptoc/load_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/load_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/load_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.cc b/cef/libcef_dll/cpptoc/menu_model_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/menu_model_cpptoc.cc rename to cef/libcef_dll/cpptoc/menu_model_cpptoc.cc diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.h b/cef/libcef_dll/cpptoc/menu_model_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/menu_model_cpptoc.h rename to cef/libcef_dll/cpptoc/menu_model_cpptoc.h diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/permission_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/permission_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/permission_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.h b/cef/libcef_dll/cpptoc/permission_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/permission_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/permission_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/post_data_cpptoc.cc b/cef/libcef_dll/cpptoc/post_data_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/post_data_cpptoc.cc rename to cef/libcef_dll/cpptoc/post_data_cpptoc.cc diff --git a/libcef_dll/cpptoc/post_data_cpptoc.h b/cef/libcef_dll/cpptoc/post_data_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/post_data_cpptoc.h rename to cef/libcef_dll/cpptoc/post_data_cpptoc.h diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.cc b/cef/libcef_dll/cpptoc/post_data_element_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/post_data_element_cpptoc.cc rename to cef/libcef_dll/cpptoc/post_data_element_cpptoc.cc diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.h b/cef/libcef_dll/cpptoc/post_data_element_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/post_data_element_cpptoc.h rename to cef/libcef_dll/cpptoc/post_data_element_cpptoc.h diff --git a/libcef_dll/cpptoc/process_message_cpptoc.cc b/cef/libcef_dll/cpptoc/process_message_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/process_message_cpptoc.cc rename to cef/libcef_dll/cpptoc/process_message_cpptoc.cc diff --git a/libcef_dll/cpptoc/process_message_cpptoc.h b/cef/libcef_dll/cpptoc/process_message_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/process_message_cpptoc.h rename to cef/libcef_dll/cpptoc/process_message_cpptoc.h diff --git a/libcef_dll/cpptoc/proxy_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/proxy_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/proxy_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/proxy_handler_cpptoc.h b/cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/proxy_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/proxy_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/read_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/read_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/read_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.h b/cef/libcef_dll/cpptoc/read_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/read_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/read_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/render_process_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/render_process_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.h b/cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/render_process_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/render_process_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/request_cpptoc.cc b/cef/libcef_dll/cpptoc/request_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/request_cpptoc.cc rename to cef/libcef_dll/cpptoc/request_cpptoc.cc diff --git a/libcef_dll/cpptoc/request_cpptoc.h b/cef/libcef_dll/cpptoc/request_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/request_cpptoc.h rename to cef/libcef_dll/cpptoc/request_cpptoc.h diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/request_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/request_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/request_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.h b/cef/libcef_dll/cpptoc/request_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/request_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/request_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h b/cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/resource_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/resource_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.h b/cef/libcef_dll/cpptoc/resource_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/resource_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/resource_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/response_cpptoc.cc b/cef/libcef_dll/cpptoc/response_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/response_cpptoc.cc rename to cef/libcef_dll/cpptoc/response_cpptoc.cc diff --git a/libcef_dll/cpptoc/response_cpptoc.h b/cef/libcef_dll/cpptoc/response_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/response_cpptoc.h rename to cef/libcef_dll/cpptoc/response_cpptoc.h diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc rename to cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h rename to cef/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc b/cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/scheme_registrar_cpptoc.cc rename to cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h b/cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/scheme_registrar_cpptoc.h rename to cef/libcef_dll/cpptoc/scheme_registrar_cpptoc.h diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.cc b/cef/libcef_dll/cpptoc/stream_reader_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/stream_reader_cpptoc.cc rename to cef/libcef_dll/cpptoc/stream_reader_cpptoc.cc diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.h b/cef/libcef_dll/cpptoc/stream_reader_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/stream_reader_cpptoc.h rename to cef/libcef_dll/cpptoc/stream_reader_cpptoc.h diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.cc b/cef/libcef_dll/cpptoc/stream_writer_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/stream_writer_cpptoc.cc rename to cef/libcef_dll/cpptoc/stream_writer_cpptoc.cc diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.h b/cef/libcef_dll/cpptoc/stream_writer_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/stream_writer_cpptoc.h rename to cef/libcef_dll/cpptoc/stream_writer_cpptoc.h diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/string_visitor_cpptoc.cc rename to cef/libcef_dll/cpptoc/string_visitor_cpptoc.cc diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/string_visitor_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/string_visitor_cpptoc.h rename to cef/libcef_dll/cpptoc/string_visitor_cpptoc.h diff --git a/libcef_dll/cpptoc/task_cpptoc.cc b/cef/libcef_dll/cpptoc/task_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/task_cpptoc.cc rename to cef/libcef_dll/cpptoc/task_cpptoc.cc diff --git a/libcef_dll/cpptoc/task_cpptoc.h b/cef/libcef_dll/cpptoc/task_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/task_cpptoc.h rename to cef/libcef_dll/cpptoc/task_cpptoc.h diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/urlrequest_client_cpptoc.cc rename to cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h b/cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/urlrequest_client_cpptoc.h rename to cef/libcef_dll/cpptoc/urlrequest_client_cpptoc.h diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.cc b/cef/libcef_dll/cpptoc/urlrequest_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/urlrequest_cpptoc.cc rename to cef/libcef_dll/cpptoc/urlrequest_cpptoc.cc diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.h b/cef/libcef_dll/cpptoc/urlrequest_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/urlrequest_cpptoc.h rename to cef/libcef_dll/cpptoc/urlrequest_cpptoc.h diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/v8accessor_cpptoc.cc rename to cef/libcef_dll/cpptoc/v8accessor_cpptoc.cc diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.h b/cef/libcef_dll/cpptoc/v8accessor_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/v8accessor_cpptoc.h rename to cef/libcef_dll/cpptoc/v8accessor_cpptoc.h diff --git a/libcef_dll/cpptoc/v8context_cpptoc.cc b/cef/libcef_dll/cpptoc/v8context_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/v8context_cpptoc.cc rename to cef/libcef_dll/cpptoc/v8context_cpptoc.cc diff --git a/libcef_dll/cpptoc/v8context_cpptoc.h b/cef/libcef_dll/cpptoc/v8context_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/v8context_cpptoc.h rename to cef/libcef_dll/cpptoc/v8context_cpptoc.h diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.cc b/cef/libcef_dll/cpptoc/v8exception_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/v8exception_cpptoc.cc rename to cef/libcef_dll/cpptoc/v8exception_cpptoc.cc diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.h b/cef/libcef_dll/cpptoc/v8exception_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/v8exception_cpptoc.h rename to cef/libcef_dll/cpptoc/v8exception_cpptoc.h diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.cc b/cef/libcef_dll/cpptoc/v8handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/v8handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/v8handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.h b/cef/libcef_dll/cpptoc/v8handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/v8handler_cpptoc.h rename to cef/libcef_dll/cpptoc/v8handler_cpptoc.h diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/cef/libcef_dll/cpptoc/v8value_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/v8value_cpptoc.cc rename to cef/libcef_dll/cpptoc/v8value_cpptoc.cc diff --git a/libcef_dll/cpptoc/v8value_cpptoc.h b/cef/libcef_dll/cpptoc/v8value_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/v8value_cpptoc.h rename to cef/libcef_dll/cpptoc/v8value_cpptoc.h diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc b/cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/web_plugin_info_cpptoc.cc rename to cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.h b/cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/web_plugin_info_cpptoc.h rename to cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.h diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc rename to cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h b/cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h rename to cef/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/write_handler_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/write_handler_cpptoc.cc rename to cef/libcef_dll/cpptoc/write_handler_cpptoc.cc diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.h b/cef/libcef_dll/cpptoc/write_handler_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/write_handler_cpptoc.h rename to cef/libcef_dll/cpptoc/write_handler_cpptoc.h diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.cc b/cef/libcef_dll/cpptoc/xml_reader_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/xml_reader_cpptoc.cc rename to cef/libcef_dll/cpptoc/xml_reader_cpptoc.cc diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.h b/cef/libcef_dll/cpptoc/xml_reader_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/xml_reader_cpptoc.h rename to cef/libcef_dll/cpptoc/xml_reader_cpptoc.h diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.cc b/cef/libcef_dll/cpptoc/zip_reader_cpptoc.cc similarity index 100% rename from libcef_dll/cpptoc/zip_reader_cpptoc.cc rename to cef/libcef_dll/cpptoc/zip_reader_cpptoc.cc diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.h b/cef/libcef_dll/cpptoc/zip_reader_cpptoc.h similarity index 100% rename from libcef_dll/cpptoc/zip_reader_cpptoc.h rename to cef/libcef_dll/cpptoc/zip_reader_cpptoc.h diff --git a/libcef_dll/ctocpp/app_ctocpp.cc b/cef/libcef_dll/ctocpp/app_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/app_ctocpp.cc rename to cef/libcef_dll/ctocpp/app_ctocpp.cc diff --git a/libcef_dll/ctocpp/app_ctocpp.h b/cef/libcef_dll/ctocpp/app_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/app_ctocpp.h rename to cef/libcef_dll/ctocpp/app_ctocpp.h diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/auth_callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/auth_callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.h b/cef/libcef_dll/ctocpp/auth_callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/auth_callback_ctocpp.h rename to cef/libcef_dll/ctocpp/auth_callback_ctocpp.h diff --git a/libcef_dll/ctocpp/base_ctocpp.h b/cef/libcef_dll/ctocpp/base_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/base_ctocpp.h rename to cef/libcef_dll/ctocpp/base_ctocpp.h diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/before_download_callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/before_download_callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.h b/cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/before_download_callback_ctocpp.h rename to cef/libcef_dll/ctocpp/before_download_callback_ctocpp.h diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.cc b/cef/libcef_dll/ctocpp/binary_value_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/binary_value_ctocpp.cc rename to cef/libcef_dll/ctocpp/binary_value_ctocpp.cc diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.h b/cef/libcef_dll/ctocpp/binary_value_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/binary_value_ctocpp.h rename to cef/libcef_dll/ctocpp/binary_value_ctocpp.h diff --git a/libcef_dll/ctocpp/browser_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/browser_ctocpp.cc rename to cef/libcef_dll/ctocpp/browser_ctocpp.cc diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/cef/libcef_dll/ctocpp/browser_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/browser_ctocpp.h rename to cef/libcef_dll/ctocpp/browser_ctocpp.h diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_host_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/browser_host_ctocpp.cc rename to cef/libcef_dll/ctocpp/browser_host_ctocpp.cc diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/cef/libcef_dll/ctocpp/browser_host_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/browser_host_ctocpp.h rename to cef/libcef_dll/ctocpp/browser_host_ctocpp.h diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/browser_process_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.h b/cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/browser_process_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/browser_process_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/callback_ctocpp.cc b/cef/libcef_dll/ctocpp/callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/callback_ctocpp.h b/cef/libcef_dll/ctocpp/callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/callback_ctocpp.h rename to cef/libcef_dll/ctocpp/callback_ctocpp.h diff --git a/libcef_dll/ctocpp/client_ctocpp.cc b/cef/libcef_dll/ctocpp/client_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/client_ctocpp.cc rename to cef/libcef_dll/ctocpp/client_ctocpp.cc diff --git a/libcef_dll/ctocpp/client_ctocpp.h b/cef/libcef_dll/ctocpp/client_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/client_ctocpp.h rename to cef/libcef_dll/ctocpp/client_ctocpp.h diff --git a/libcef_dll/ctocpp/command_line_ctocpp.cc b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/command_line_ctocpp.cc rename to cef/libcef_dll/ctocpp/command_line_ctocpp.cc diff --git a/libcef_dll/ctocpp/command_line_ctocpp.h b/cef/libcef_dll/ctocpp/command_line_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/command_line_ctocpp.h rename to cef/libcef_dll/ctocpp/command_line_ctocpp.h diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/context_menu_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.h b/cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/context_menu_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/context_menu_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.cc b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/context_menu_params_ctocpp.cc rename to cef/libcef_dll/ctocpp/context_menu_params_ctocpp.cc diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.h b/cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/context_menu_params_ctocpp.h rename to cef/libcef_dll/ctocpp/context_menu_params_ctocpp.h diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/cookie_manager_ctocpp.cc rename to cef/libcef_dll/ctocpp/cookie_manager_ctocpp.cc diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.h b/cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/cookie_manager_ctocpp.h rename to cef/libcef_dll/ctocpp/cookie_manager_ctocpp.h diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc b/cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/cookie_visitor_ctocpp.cc rename to cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.h b/cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/cookie_visitor_ctocpp.h rename to cef/libcef_dll/ctocpp/cookie_visitor_ctocpp.h diff --git a/libcef_dll/ctocpp/ctocpp.h b/cef/libcef_dll/ctocpp/ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/ctocpp.h rename to cef/libcef_dll/ctocpp/ctocpp.h diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/dictionary_value_ctocpp.cc rename to cef/libcef_dll/ctocpp/dictionary_value_ctocpp.cc diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.h b/cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/dictionary_value_ctocpp.h rename to cef/libcef_dll/ctocpp/dictionary_value_ctocpp.h diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/display_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/display_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/display_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.h b/cef/libcef_dll/ctocpp/display_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/display_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/display_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.cc b/cef/libcef_dll/ctocpp/domdocument_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/domdocument_ctocpp.cc rename to cef/libcef_dll/ctocpp/domdocument_ctocpp.cc diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.h b/cef/libcef_dll/ctocpp/domdocument_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/domdocument_ctocpp.h rename to cef/libcef_dll/ctocpp/domdocument_ctocpp.h diff --git a/libcef_dll/ctocpp/domevent_ctocpp.cc b/cef/libcef_dll/ctocpp/domevent_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/domevent_ctocpp.cc rename to cef/libcef_dll/ctocpp/domevent_ctocpp.cc diff --git a/libcef_dll/ctocpp/domevent_ctocpp.h b/cef/libcef_dll/ctocpp/domevent_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/domevent_ctocpp.h rename to cef/libcef_dll/ctocpp/domevent_ctocpp.h diff --git a/libcef_dll/ctocpp/domevent_listener_ctocpp.cc b/cef/libcef_dll/ctocpp/domevent_listener_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/domevent_listener_ctocpp.cc rename to cef/libcef_dll/ctocpp/domevent_listener_ctocpp.cc diff --git a/libcef_dll/ctocpp/domevent_listener_ctocpp.h b/cef/libcef_dll/ctocpp/domevent_listener_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/domevent_listener_ctocpp.h rename to cef/libcef_dll/ctocpp/domevent_listener_ctocpp.h diff --git a/libcef_dll/ctocpp/domnode_ctocpp.cc b/cef/libcef_dll/ctocpp/domnode_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/domnode_ctocpp.cc rename to cef/libcef_dll/ctocpp/domnode_ctocpp.cc diff --git a/libcef_dll/ctocpp/domnode_ctocpp.h b/cef/libcef_dll/ctocpp/domnode_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/domnode_ctocpp.h rename to cef/libcef_dll/ctocpp/domnode_ctocpp.h diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.cc b/cef/libcef_dll/ctocpp/domvisitor_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/domvisitor_ctocpp.cc rename to cef/libcef_dll/ctocpp/domvisitor_ctocpp.cc diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.h b/cef/libcef_dll/ctocpp/domvisitor_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/domvisitor_ctocpp.h rename to cef/libcef_dll/ctocpp/domvisitor_ctocpp.h diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/download_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/download_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/download_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.h b/cef/libcef_dll/ctocpp/download_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/download_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/download_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/download_item_callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/download_item_callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.h b/cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/download_item_callback_ctocpp.h rename to cef/libcef_dll/ctocpp/download_item_callback_ctocpp.h diff --git a/libcef_dll/ctocpp/download_item_ctocpp.cc b/cef/libcef_dll/ctocpp/download_item_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/download_item_ctocpp.cc rename to cef/libcef_dll/ctocpp/download_item_ctocpp.cc diff --git a/libcef_dll/ctocpp/download_item_ctocpp.h b/cef/libcef_dll/ctocpp/download_item_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/download_item_ctocpp.h rename to cef/libcef_dll/ctocpp/download_item_ctocpp.h diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/focus_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/focus_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/focus_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.h b/cef/libcef_dll/ctocpp/focus_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/focus_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/focus_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/frame_ctocpp.cc b/cef/libcef_dll/ctocpp/frame_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/frame_ctocpp.cc rename to cef/libcef_dll/ctocpp/frame_ctocpp.cc diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/cef/libcef_dll/ctocpp/frame_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/frame_ctocpp.h rename to cef/libcef_dll/ctocpp/frame_ctocpp.h diff --git a/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/geolocation_callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/geolocation_callback_ctocpp.h b/cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/geolocation_callback_ctocpp.h rename to cef/libcef_dll/ctocpp/geolocation_callback_ctocpp.h diff --git a/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/geolocation_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/geolocation_handler_ctocpp.h b/cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/geolocation_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/geolocation_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc b/cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc rename to cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h b/cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/jsdialog_callback_ctocpp.h rename to cef/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h b/cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/jsdialog_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/keyboard_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.h b/cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/keyboard_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/keyboard_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/life_span_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/life_span_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/life_span_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.h b/cef/libcef_dll/ctocpp/life_span_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/life_span_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/life_span_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/list_value_ctocpp.cc b/cef/libcef_dll/ctocpp/list_value_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/list_value_ctocpp.cc rename to cef/libcef_dll/ctocpp/list_value_ctocpp.cc diff --git a/libcef_dll/ctocpp/list_value_ctocpp.h b/cef/libcef_dll/ctocpp/list_value_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/list_value_ctocpp.h rename to cef/libcef_dll/ctocpp/list_value_ctocpp.h diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/load_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/load_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/load_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.h b/cef/libcef_dll/ctocpp/load_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/load_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/load_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.cc b/cef/libcef_dll/ctocpp/menu_model_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/menu_model_ctocpp.cc rename to cef/libcef_dll/ctocpp/menu_model_ctocpp.cc diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.h b/cef/libcef_dll/ctocpp/menu_model_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/menu_model_ctocpp.h rename to cef/libcef_dll/ctocpp/menu_model_ctocpp.h diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/permission_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/permission_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/permission_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.h b/cef/libcef_dll/ctocpp/permission_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/permission_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/permission_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/post_data_ctocpp.cc b/cef/libcef_dll/ctocpp/post_data_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/post_data_ctocpp.cc rename to cef/libcef_dll/ctocpp/post_data_ctocpp.cc diff --git a/libcef_dll/ctocpp/post_data_ctocpp.h b/cef/libcef_dll/ctocpp/post_data_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/post_data_ctocpp.h rename to cef/libcef_dll/ctocpp/post_data_ctocpp.h diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.cc b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/post_data_element_ctocpp.cc rename to cef/libcef_dll/ctocpp/post_data_element_ctocpp.cc diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.h b/cef/libcef_dll/ctocpp/post_data_element_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/post_data_element_ctocpp.h rename to cef/libcef_dll/ctocpp/post_data_element_ctocpp.h diff --git a/libcef_dll/ctocpp/process_message_ctocpp.cc b/cef/libcef_dll/ctocpp/process_message_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/process_message_ctocpp.cc rename to cef/libcef_dll/ctocpp/process_message_ctocpp.cc diff --git a/libcef_dll/ctocpp/process_message_ctocpp.h b/cef/libcef_dll/ctocpp/process_message_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/process_message_ctocpp.h rename to cef/libcef_dll/ctocpp/process_message_ctocpp.h diff --git a/libcef_dll/ctocpp/proxy_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/proxy_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/proxy_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/proxy_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/proxy_handler_ctocpp.h b/cef/libcef_dll/ctocpp/proxy_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/proxy_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/proxy_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/read_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/read_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/read_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.h b/cef/libcef_dll/ctocpp/read_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/read_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/read_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/render_process_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/render_process_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/render_process_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.h b/cef/libcef_dll/ctocpp/render_process_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/render_process_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/render_process_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/request_ctocpp.cc b/cef/libcef_dll/ctocpp/request_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/request_ctocpp.cc rename to cef/libcef_dll/ctocpp/request_ctocpp.cc diff --git a/libcef_dll/ctocpp/request_ctocpp.h b/cef/libcef_dll/ctocpp/request_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/request_ctocpp.h rename to cef/libcef_dll/ctocpp/request_ctocpp.h diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/request_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/request_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/request_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/cef/libcef_dll/ctocpp/request_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/request_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/request_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h b/cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/resource_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/resource_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/resource_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.h b/cef/libcef_dll/ctocpp/resource_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/resource_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/resource_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/response_ctocpp.cc b/cef/libcef_dll/ctocpp/response_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/response_ctocpp.cc rename to cef/libcef_dll/ctocpp/response_ctocpp.cc diff --git a/libcef_dll/ctocpp/response_ctocpp.h b/cef/libcef_dll/ctocpp/response_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/response_ctocpp.h rename to cef/libcef_dll/ctocpp/response_ctocpp.h diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc b/cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc rename to cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h b/cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h rename to cef/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc b/cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/scheme_registrar_ctocpp.cc rename to cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.h b/cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/scheme_registrar_ctocpp.h rename to cef/libcef_dll/ctocpp/scheme_registrar_ctocpp.h diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/stream_reader_ctocpp.cc rename to cef/libcef_dll/ctocpp/stream_reader_ctocpp.cc diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.h b/cef/libcef_dll/ctocpp/stream_reader_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/stream_reader_ctocpp.h rename to cef/libcef_dll/ctocpp/stream_reader_ctocpp.h diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.cc b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/stream_writer_ctocpp.cc rename to cef/libcef_dll/ctocpp/stream_writer_ctocpp.cc diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.h b/cef/libcef_dll/ctocpp/stream_writer_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/stream_writer_ctocpp.h rename to cef/libcef_dll/ctocpp/stream_writer_ctocpp.h diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.cc b/cef/libcef_dll/ctocpp/string_visitor_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/string_visitor_ctocpp.cc rename to cef/libcef_dll/ctocpp/string_visitor_ctocpp.cc diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.h b/cef/libcef_dll/ctocpp/string_visitor_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/string_visitor_ctocpp.h rename to cef/libcef_dll/ctocpp/string_visitor_ctocpp.h diff --git a/libcef_dll/ctocpp/task_ctocpp.cc b/cef/libcef_dll/ctocpp/task_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/task_ctocpp.cc rename to cef/libcef_dll/ctocpp/task_ctocpp.cc diff --git a/libcef_dll/ctocpp/task_ctocpp.h b/cef/libcef_dll/ctocpp/task_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/task_ctocpp.h rename to cef/libcef_dll/ctocpp/task_ctocpp.h diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc b/cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/urlrequest_client_ctocpp.cc rename to cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.h b/cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/urlrequest_client_ctocpp.h rename to cef/libcef_dll/ctocpp/urlrequest_client_ctocpp.h diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.cc b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/urlrequest_ctocpp.cc rename to cef/libcef_dll/ctocpp/urlrequest_ctocpp.cc diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.h b/cef/libcef_dll/ctocpp/urlrequest_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/urlrequest_ctocpp.h rename to cef/libcef_dll/ctocpp/urlrequest_ctocpp.h diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.cc b/cef/libcef_dll/ctocpp/v8accessor_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/v8accessor_ctocpp.cc rename to cef/libcef_dll/ctocpp/v8accessor_ctocpp.cc diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.h b/cef/libcef_dll/ctocpp/v8accessor_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/v8accessor_ctocpp.h rename to cef/libcef_dll/ctocpp/v8accessor_ctocpp.h diff --git a/libcef_dll/ctocpp/v8context_ctocpp.cc b/cef/libcef_dll/ctocpp/v8context_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/v8context_ctocpp.cc rename to cef/libcef_dll/ctocpp/v8context_ctocpp.cc diff --git a/libcef_dll/ctocpp/v8context_ctocpp.h b/cef/libcef_dll/ctocpp/v8context_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/v8context_ctocpp.h rename to cef/libcef_dll/ctocpp/v8context_ctocpp.h diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.cc b/cef/libcef_dll/ctocpp/v8exception_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/v8exception_ctocpp.cc rename to cef/libcef_dll/ctocpp/v8exception_ctocpp.cc diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.h b/cef/libcef_dll/ctocpp/v8exception_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/v8exception_ctocpp.h rename to cef/libcef_dll/ctocpp/v8exception_ctocpp.h diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.cc b/cef/libcef_dll/ctocpp/v8handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/v8handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/v8handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.h b/cef/libcef_dll/ctocpp/v8handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/v8handler_ctocpp.h rename to cef/libcef_dll/ctocpp/v8handler_ctocpp.h diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/cef/libcef_dll/ctocpp/v8value_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/v8value_ctocpp.cc rename to cef/libcef_dll/ctocpp/v8value_ctocpp.cc diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/cef/libcef_dll/ctocpp/v8value_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/v8value_ctocpp.h rename to cef/libcef_dll/ctocpp/v8value_ctocpp.h diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/web_plugin_info_ctocpp.cc rename to cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h b/cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/web_plugin_info_ctocpp.h rename to cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.h diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc b/cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc rename to cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h b/cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h rename to cef/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.cc b/cef/libcef_dll/ctocpp/write_handler_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/write_handler_ctocpp.cc rename to cef/libcef_dll/ctocpp/write_handler_ctocpp.cc diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.h b/cef/libcef_dll/ctocpp/write_handler_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/write_handler_ctocpp.h rename to cef/libcef_dll/ctocpp/write_handler_ctocpp.h diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/xml_reader_ctocpp.cc rename to cef/libcef_dll/ctocpp/xml_reader_ctocpp.cc diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/cef/libcef_dll/ctocpp/xml_reader_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/xml_reader_ctocpp.h rename to cef/libcef_dll/ctocpp/xml_reader_ctocpp.h diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc similarity index 100% rename from libcef_dll/ctocpp/zip_reader_ctocpp.cc rename to cef/libcef_dll/ctocpp/zip_reader_ctocpp.cc diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.h b/cef/libcef_dll/ctocpp/zip_reader_ctocpp.h similarity index 100% rename from libcef_dll/ctocpp/zip_reader_ctocpp.h rename to cef/libcef_dll/ctocpp/zip_reader_ctocpp.h diff --git a/libcef_dll/libcef_dll.cc b/cef/libcef_dll/libcef_dll.cc similarity index 100% rename from libcef_dll/libcef_dll.cc rename to cef/libcef_dll/libcef_dll.cc diff --git a/libcef_dll/libcef_dll.rc b/cef/libcef_dll/libcef_dll.rc similarity index 96% rename from libcef_dll/libcef_dll.rc rename to cef/libcef_dll/libcef_dll.rc index 569469e9b..da6009deb 100644 --- a/libcef_dll/libcef_dll.rc +++ b/cef/libcef_dll/libcef_dll.rc @@ -1,143 +1,143 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#include "include/cef_version.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#include ""include/version.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ALERT DIALOGEX 0, 0, 241, 76 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "JavaScript Alert" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,184,55,50,14 - LTEXT "",IDC_DIALOGTEXT,16,17,210,30 -END - -IDD_CONFIRM DIALOGEX 0, 0, 241, 76 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "JavaScript Confirm" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - PUSHBUTTON "Cancel",IDCANCEL,184,55,50,14 - DEFPUSHBUTTON "OK",IDOK,131,55,50,14 - LTEXT "",IDC_DIALOGTEXT,16,17,210,30 -END - -IDD_PROMPT DIALOGEX 0, 0, 241, 76 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "JavaScript Prompt" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,131,55,50,14 - LTEXT "",IDC_DIALOGTEXT,16,17,210,18 - PUSHBUTTON "Cancel",IDCANCEL,184,55,50,14 - EDITTEXT IDC_PROMPTEDIT,15,33,210,14,ES_AUTOHSCROLL -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,CHROME_VERSION_BUILD,CEF_REVISION,0 - PRODUCTVERSION 3,CHROME_VERSION_BUILD,CEF_REVISION,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Chromium Embedded Framework (CEF) Dynamic Link Library" - VALUE "FileVersion", "3." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) - VALUE "InternalName", "libcef" - VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors" - VALUE "OriginalFilename", "libcef.dll" - VALUE "ProductName", "Chromium Embedded Framework (CEF) Dynamic Link Library" - VALUE "ProductVersion", "3." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#include "include/cef_version.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#include ""include/version.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ALERT DIALOGEX 0, 0, 241, 76 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "JavaScript Alert" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,184,55,50,14 + LTEXT "",IDC_DIALOGTEXT,16,17,210,30 +END + +IDD_CONFIRM DIALOGEX 0, 0, 241, 76 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "JavaScript Confirm" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + PUSHBUTTON "Cancel",IDCANCEL,184,55,50,14 + DEFPUSHBUTTON "OK",IDOK,131,55,50,14 + LTEXT "",IDC_DIALOGTEXT,16,17,210,30 +END + +IDD_PROMPT DIALOGEX 0, 0, 241, 76 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "JavaScript Prompt" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,131,55,50,14 + LTEXT "",IDC_DIALOGTEXT,16,17,210,18 + PUSHBUTTON "Cancel",IDCANCEL,184,55,50,14 + EDITTEXT IDC_PROMPTEDIT,15,33,210,14,ES_AUTOHSCROLL +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,CHROME_VERSION_BUILD,CEF_REVISION,0 + PRODUCTVERSION 3,CHROME_VERSION_BUILD,CEF_REVISION,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Chromium Embedded Framework (CEF) Dynamic Link Library" + VALUE "FileVersion", "3." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) + VALUE "InternalName", "libcef" + VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors" + VALUE "OriginalFilename", "libcef.dll" + VALUE "ProductName", "Chromium Embedded Framework (CEF) Dynamic Link Library" + VALUE "ProductVersion", "3." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/libcef_dll/libcef_dll2.cc b/cef/libcef_dll/libcef_dll2.cc similarity index 100% rename from libcef_dll/libcef_dll2.cc rename to cef/libcef_dll/libcef_dll2.cc diff --git a/libcef_dll/resource.h b/cef/libcef_dll/resource.h similarity index 100% rename from libcef_dll/resource.h rename to cef/libcef_dll/resource.h diff --git a/libcef_dll/transfer_util.cpp b/cef/libcef_dll/transfer_util.cpp similarity index 100% rename from libcef_dll/transfer_util.cpp rename to cef/libcef_dll/transfer_util.cpp diff --git a/libcef_dll/transfer_util.h b/cef/libcef_dll/transfer_util.h similarity index 100% rename from libcef_dll/transfer_util.h rename to cef/libcef_dll/transfer_util.h diff --git a/libcef_dll/wrapper/cef_byte_read_handler.cc b/cef/libcef_dll/wrapper/cef_byte_read_handler.cc similarity index 100% rename from libcef_dll/wrapper/cef_byte_read_handler.cc rename to cef/libcef_dll/wrapper/cef_byte_read_handler.cc diff --git a/libcef_dll/wrapper/cef_stream_resource_handler.cc b/cef/libcef_dll/wrapper/cef_stream_resource_handler.cc similarity index 100% rename from libcef_dll/wrapper/cef_stream_resource_handler.cc rename to cef/libcef_dll/wrapper/cef_stream_resource_handler.cc diff --git a/libcef_dll/wrapper/cef_xml_object.cc b/cef/libcef_dll/wrapper/cef_xml_object.cc similarity index 100% rename from libcef_dll/wrapper/cef_xml_object.cc rename to cef/libcef_dll/wrapper/cef_xml_object.cc diff --git a/libcef_dll/wrapper/cef_zip_archive.cc b/cef/libcef_dll/wrapper/cef_zip_archive.cc similarity index 100% rename from libcef_dll/wrapper/cef_zip_archive.cc rename to cef/libcef_dll/wrapper/cef_zip_archive.cc diff --git a/libcef_dll/wrapper/libcef_dll_wrapper.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc similarity index 100% rename from libcef_dll/wrapper/libcef_dll_wrapper.cc rename to cef/libcef_dll/wrapper/libcef_dll_wrapper.cc diff --git a/libcef_dll/wrapper/libcef_dll_wrapper2.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc similarity index 100% rename from libcef_dll/wrapper/libcef_dll_wrapper2.cc rename to cef/libcef_dll/wrapper/libcef_dll_wrapper2.cc