From 49a34d916037ff4b8b859218af2ecb1cbf435f0d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 30 Apr 2024 11:45:07 -0400 Subject: [PATCH] Apply new Chromium style for #include sorting Add "cef/" prefix for CEF #includes in libcef/ directory. Sort #includes by following https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes --- BUILD.gn | 14 ++-- include/base/cef_build.h | 1 - include/base/cef_tuple.h | 1 + include/cef_browser.h | 1 + include/cef_command_line.h | 1 + include/cef_cookie.h | 1 + include/cef_dom.h | 1 + include/cef_drag_data.h | 1 + include/cef_media_router.h | 1 + include/cef_request.h | 1 + include/cef_response.h | 1 + include/cef_server.h | 1 + include/cef_ssl_info.h | 1 - include/cef_v8.h | 1 + include/cef_values.h | 1 + include/test/cef_test_server.h | 1 + libcef/browser/alloy/alloy_browser_context.cc | 17 ++--- libcef/browser/alloy/alloy_browser_context.h | 9 +-- .../browser/alloy/alloy_browser_host_impl.cc | 43 ++++++----- .../browser/alloy/alloy_browser_host_impl.h | 19 +++-- libcef/browser/alloy/alloy_browser_main.cc | 33 ++++---- libcef/browser/alloy/alloy_browser_main.h | 3 +- .../browser/alloy/alloy_browser_main_win.cc | 6 +- .../alloy/alloy_content_browser_client.cc | 75 +++++++++---------- .../alloy/alloy_content_browser_client.h | 5 +- .../alloy/alloy_download_manager_delegate.cc | 2 +- .../alloy/alloy_download_manager_delegate.h | 2 +- libcef/browser/alloy/alloy_download_util.cc | 4 +- .../alloy/alloy_web_contents_view_delegate.cc | 5 +- .../alloy/alloy_web_contents_view_delegate.h | 3 +- .../alloy/browser_platform_delegate_alloy.cc | 22 +++--- .../alloy/browser_platform_delegate_alloy.h | 5 +- .../alloy/chrome_browser_process_alloy.cc | 21 +++--- libcef/browser/alloy/chrome_profile_alloy.cc | 2 +- .../alloy/chrome_profile_manager_alloy.cc | 8 +- .../devtools/alloy_devtools_window_runner.cc | 6 +- .../devtools/alloy_devtools_window_runner.h | 3 +- .../alloy/devtools/devtools_file_manager.cc | 5 +- .../alloy/devtools/devtools_file_manager.h | 6 +- .../alloy/devtools/devtools_frontend.cc | 17 ++--- .../alloy/devtools/devtools_frontend.h | 5 +- .../devtools/devtools_manager_delegate.cc | 2 +- .../alloy_constrained_window_views_client.cc | 5 +- ...lloy_javascript_dialog_manager_delegate.cc | 5 +- ...alloy_javascript_dialog_manager_delegate.h | 2 +- .../alloy_web_contents_dialog_helper.cc | 5 +- libcef/browser/audio_capturer.cc | 7 +- libcef/browser/audio_capturer.h | 5 +- .../browser/audio_loopback_stream_creator.cc | 2 +- libcef/browser/browser_contents_delegate.cc | 13 ++-- libcef/browser/browser_contents_delegate.h | 3 +- libcef/browser/browser_context.cc | 15 ++-- libcef/browser/browser_context.h | 7 +- ...browser_context_keyed_service_factories.cc | 4 +- libcef/browser/browser_frame.cc | 11 ++- libcef/browser/browser_frame.h | 5 +- libcef/browser/browser_host_base.cc | 25 +++---- libcef/browser/browser_host_base.h | 27 ++++--- libcef/browser/browser_host_create.cc | 14 ++-- libcef/browser/browser_info.cc | 13 ++-- libcef/browser/browser_info.h | 5 +- libcef/browser/browser_info_manager.cc | 21 +++--- libcef/browser/browser_info_manager.h | 6 +- libcef/browser/browser_manager.cc | 9 +-- libcef/browser/browser_message_loop.cc | 4 +- libcef/browser/browser_platform_delegate.cc | 15 ++-- libcef/browser/browser_platform_delegate.h | 9 +-- .../browser_platform_delegate_create.cc | 33 ++++---- libcef/browser/browser_util.cc | 2 +- libcef/browser/browser_util.h | 2 +- libcef/browser/certificate_query.cc | 11 ++- .../browser_platform_delegate_chrome.cc | 5 +- .../chrome/browser_platform_delegate_chrome.h | 4 +- .../browser/chrome/chrome_browser_context.cc | 7 +- .../browser/chrome/chrome_browser_context.h | 3 +- .../browser/chrome/chrome_browser_delegate.cc | 37 +++++---- .../browser/chrome/chrome_browser_delegate.h | 6 +- .../chrome/chrome_browser_host_impl.cc | 19 +++-- .../browser/chrome/chrome_browser_host_impl.h | 5 +- .../chrome_browser_main_extra_parts_cef.cc | 17 ++--- .../chrome_browser_main_extra_parts_cef.h | 3 +- .../chrome_content_browser_client_cef.cc | 41 +++++----- .../chrome_content_browser_client_cef.h | 3 +- .../chrome_content_browser_client_cef_mac.mm | 9 ++- .../chrome/chrome_context_menu_handler.cc | 12 ++- .../chrome/chrome_devtools_window_runner.cc | 9 +-- .../chrome/chrome_devtools_window_runner.h | 3 +- .../chrome/chrome_startup_browser_creator.cc | 9 +-- .../chrome_web_contents_view_delegate_cef.cc | 4 +- ...rome_web_contents_view_delegate_cef_mac.mm | 2 +- .../extensions/chrome_extension_util.cc | 5 +- ...me_mime_handler_view_guest_delegate_cef.cc | 9 +-- ...r_platform_delegate_chrome_child_window.cc | 6 +- ...er_platform_delegate_chrome_child_window.h | 2 +- .../browser_platform_delegate_chrome_views.cc | 7 +- .../browser_platform_delegate_chrome_views.h | 4 +- .../chrome/views/chrome_browser_frame.cc | 13 ++-- .../chrome/views/chrome_browser_frame.h | 5 +- .../chrome/views/chrome_browser_view.cc | 6 +- .../chrome/views/chrome_browser_view.h | 11 ++- .../chrome/views/chrome_child_window.cc | 11 ++- .../chrome/views/chrome_child_window.h | 4 +- .../browser/chrome/views/chrome_views_util.cc | 4 +- .../browser/chrome/views/toolbar_view_impl.cc | 2 +- .../browser/chrome/views/toolbar_view_impl.h | 7 +- .../browser/chrome/views/toolbar_view_view.cc | 2 +- .../browser/chrome/views/toolbar_view_view.h | 3 +- libcef/browser/context.cc | 15 ++-- libcef/browser/context.h | 5 +- libcef/browser/context_menu_params_impl.cc | 2 +- libcef/browser/context_menu_params_impl.h | 5 +- .../browser/devtools/devtools_controller.cc | 7 +- .../devtools/devtools_protocol_manager.cc | 9 +-- .../devtools/devtools_protocol_manager.h | 2 +- libcef/browser/devtools/devtools_util.cc | 2 +- .../devtools/devtools_util_unittest.cc | 2 +- .../browser/devtools/devtools_window_runner.h | 2 +- .../devtools/devtools_window_runner_create.cc | 9 +-- libcef/browser/download_item_impl.cc | 5 +- libcef/browser/download_item_impl.h | 4 +- libcef/browser/download_manager_delegate.cc | 6 +- .../browser/download_manager_delegate_impl.cc | 13 ++-- .../browser/download_manager_delegate_impl.h | 5 +- libcef/browser/extension_impl.cc | 9 +-- libcef/browser/extension_impl.h | 6 +- .../extensions/alloy_extensions_util.cc | 4 +- .../file_system/cef_file_system_delegate.cc | 2 +- .../api/storage/sync_value_store_cache.cc | 2 +- .../browser/extensions/api/tabs/tabs_api.cc | 5 +- libcef/browser/extensions/api/tabs/tabs_api.h | 3 +- .../extensions/browser_extensions_util.cc | 2 +- .../browser_platform_delegate_background.cc | 9 +-- .../browser_platform_delegate_background.h | 4 +- .../extensions/chrome_api_registration.cc | 5 +- .../component_extension_resource_manager.cc | 2 +- .../extensions/extension_background_host.cc | 7 +- .../extensions/extension_function_details.cc | 15 ++-- .../extensions/extension_function_details.h | 6 +- .../extensions/extension_host_delegate.cc | 5 +- libcef/browser/extensions/extension_system.cc | 11 ++- libcef/browser/extensions/extension_system.h | 5 +- .../extensions/extension_system_factory.cc | 5 +- .../browser/extensions/extension_view_host.cc | 7 +- .../extension_web_contents_observer.cc | 2 +- .../extensions/extensions_api_client.cc | 15 ++-- .../extensions_browser_api_provider.cc | 5 +- .../extensions/extensions_browser_client.cc | 21 +++--- .../mime_handler_view_guest_delegate.cc | 7 +- .../extensions/value_store/cef_value_store.cc | 2 +- .../value_store/cef_value_store_factory.cc | 5 +- libcef/browser/file_dialog_manager.cc | 11 ++- libcef/browser/file_dialog_manager.h | 3 +- libcef/browser/file_dialog_runner.cc | 4 +- libcef/browser/frame_host_impl.cc | 29 ++++--- libcef/browser/frame_host_impl.h | 3 +- libcef/browser/geometry_util.cc | 4 +- libcef/browser/geometry_util_unittest.cc | 2 +- .../browser/global_preference_manager_impl.cc | 9 +-- .../browser/global_preference_manager_impl.h | 2 +- .../browser/gpu/external_texture_manager.cc | 1 + libcef/browser/hang_monitor.cc | 7 +- libcef/browser/hang_monitor.h | 3 +- libcef/browser/image_impl.cc | 2 +- libcef/browser/image_impl.h | 5 +- libcef/browser/iothread_state.cc | 9 +-- libcef/browser/iothread_state.h | 9 +-- libcef/browser/javascript_dialog_manager.cc | 9 +-- libcef/browser/javascript_dialog_manager.h | 5 +- libcef/browser/main_runner.cc | 17 +++-- libcef/browser/main_runner.h | 7 +- libcef/browser/media_access_query.cc | 17 ++--- .../media_capture_devices_dispatcher.cc | 2 +- .../browser/media_router/media_route_impl.cc | 10 +-- .../browser/media_router/media_route_impl.h | 5 +- .../browser/media_router/media_router_impl.cc | 12 +-- .../browser/media_router/media_router_impl.h | 5 +- .../media_router/media_router_manager.cc | 7 +- .../media_router/media_router_manager.h | 3 +- .../browser/media_router/media_sink_impl.cc | 5 +- libcef/browser/media_router/media_sink_impl.h | 3 +- .../browser/media_router/media_source_impl.cc | 2 +- .../browser/media_router/media_source_impl.h | 3 +- libcef/browser/media_stream_registrar.cc | 6 +- libcef/browser/menu_manager.cc | 13 ++-- libcef/browser/menu_manager.h | 6 +- libcef/browser/menu_model_impl.cc | 7 +- libcef/browser/menu_model_impl.h | 5 +- .../browser_platform_delegate_native.cc | 5 +- .../native/browser_platform_delegate_native.h | 2 +- .../browser_platform_delegate_native_aura.cc | 7 +- .../browser_platform_delegate_native_aura.h | 3 +- .../browser_platform_delegate_native_linux.cc | 13 ++-- .../browser_platform_delegate_native_linux.h | 3 +- .../browser_platform_delegate_native_mac.h | 2 +- .../browser_platform_delegate_native_mac.mm | 15 ++-- .../browser_platform_delegate_native_win.cc | 13 ++-- .../browser_platform_delegate_native_win.h | 2 +- libcef/browser/native/cursor_util.cc | 5 +- libcef/browser/native/cursor_util.h | 3 +- libcef/browser/native/cursor_util_aura.cc | 6 +- libcef/browser/native/cursor_util_mac.mm | 4 +- .../native/javascript_dialog_runner_mac.h | 3 +- .../native/javascript_dialog_runner_mac.mm | 2 +- libcef/browser/native/menu_runner_mac.h | 2 +- libcef/browser/native/menu_runner_mac.mm | 5 +- .../browser/native/menu_runner_views_aura.cc | 5 +- .../browser/native/menu_runner_views_aura.h | 3 +- libcef/browser/native/window_delegate_view.cc | 2 +- libcef/browser/native/window_x11.cc | 11 +-- libcef/browser/native/window_x11.h | 3 +- libcef/browser/navigation_entry_impl.cc | 7 +- libcef/browser/navigation_entry_impl.h | 4 +- libcef/browser/net/chrome_scheme_handler.cc | 15 ++-- libcef/browser/net/chrome_scheme_handler.h | 7 +- libcef/browser/net/crlset_file_util_impl.cc | 8 +- libcef/browser/net/devtools_scheme_handler.cc | 7 +- libcef/browser/net/internal_scheme_handler.cc | 5 +- libcef/browser/net/internal_scheme_handler.h | 3 +- libcef/browser/net/scheme_handler.cc | 11 ++- libcef/browser/net/scheme_handler.h | 3 +- libcef/browser/net/throttle_handler.cc | 13 ++-- .../net_service/browser_urlrequest_impl.cc | 21 +++--- .../net_service/browser_urlrequest_impl.h | 2 +- libcef/browser/net_service/cookie_helper.cc | 7 +- libcef/browser/net_service/cookie_helper.h | 3 +- .../net_service/cookie_manager_impl.cc | 7 +- .../browser/net_service/cookie_manager_impl.h | 7 +- libcef/browser/net_service/login_delegate.cc | 9 +-- libcef/browser/net_service/login_delegate.h | 3 +- .../net_service/proxy_url_loader_factory.cc | 15 ++-- .../net_service/proxy_url_loader_factory.h | 3 +- .../net_service/resource_handler_wrapper.cc | 11 ++- .../net_service/resource_handler_wrapper.h | 4 +- .../resource_request_handler_wrapper.cc | 31 ++++---- .../net_service/response_filter_wrapper.cc | 2 +- .../net_service/response_filter_wrapper.h | 3 +- .../net_service/stream_reader_url_loader.cc | 7 +- .../net_service/url_loader_factory_getter.cc | 7 +- libcef/browser/origin_whitelist_impl.cc | 11 ++- .../osr/browser_platform_delegate_osr.cc | 17 ++--- .../osr/browser_platform_delegate_osr.h | 4 +- .../browser_platform_delegate_osr_linux.cc | 2 +- .../osr/browser_platform_delegate_osr_linux.h | 2 +- .../osr/browser_platform_delegate_osr_mac.h | 2 +- .../osr/browser_platform_delegate_osr_mac.mm | 2 +- .../osr/browser_platform_delegate_osr_win.cc | 2 +- .../osr/browser_platform_delegate_osr_win.h | 2 +- libcef/browser/osr/host_display_client_osr.cc | 5 +- libcef/browser/osr/motion_event_osr.cc | 2 +- libcef/browser/osr/motion_event_osr.h | 3 +- libcef/browser/osr/osr_accessibility_util.cc | 2 +- libcef/browser/osr/osr_accessibility_util.h | 3 +- libcef/browser/osr/osr_util.cc | 2 +- .../osr/render_widget_host_view_osr.cc | 16 ++-- .../browser/osr/render_widget_host_view_osr.h | 12 ++- .../osr/software_output_device_proxy.cc | 1 + .../osr/software_output_device_proxy.h | 2 +- .../osr/synthetic_gesture_target_osr.cc | 2 +- .../browser/osr/touch_handle_drawable_osr.cc | 5 +- .../browser/osr/touch_handle_drawable_osr.h | 3 +- .../touch_selection_controller_client_osr.cc | 7 +- libcef/browser/osr/video_consumer_osr.cc | 5 +- libcef/browser/osr/web_contents_view_osr.cc | 11 ++- libcef/browser/path_util_impl.cc | 3 +- libcef/browser/permission_prompt.cc | 7 +- libcef/browser/prefs/browser_prefs.cc | 18 ++--- libcef/browser/prefs/pref_helper.cc | 7 +- libcef/browser/prefs/pref_helper.h | 2 +- libcef/browser/prefs/pref_registrar.cc | 13 ++-- libcef/browser/prefs/pref_registrar.h | 2 +- libcef/browser/prefs/pref_store.cc | 2 +- libcef/browser/prefs/renderer_prefs.cc | 14 ++-- libcef/browser/prefs/renderer_prefs.h | 3 +- libcef/browser/print_settings_impl.cc | 3 +- libcef/browser/print_settings_impl.h | 5 +- libcef/browser/printing/print_dialog_linux.cc | 13 ++-- libcef/browser/printing/print_dialog_linux.h | 5 +- libcef/browser/printing/print_util.cc | 5 +- libcef/browser/printing/print_util.h | 2 +- libcef/browser/process_util_impl.cc | 5 +- libcef/browser/request_context_handler_map.cc | 4 +- libcef/browser/request_context_handler_map.h | 5 +- libcef/browser/request_context_impl.cc | 16 ++-- libcef/browser/request_context_impl.h | 10 +-- libcef/browser/scheme_impl.cc | 5 +- libcef/browser/server_impl.cc | 9 +-- libcef/browser/server_impl.h | 3 +- libcef/browser/simple_menu_model_impl.cc | 6 +- libcef/browser/simple_menu_model_impl.h | 3 +- .../speech_recognition_manager_delegate.cc | 7 +- libcef/browser/ssl_host_state_delegate.cc | 2 +- libcef/browser/ssl_info_impl.cc | 4 +- libcef/browser/ssl_info_impl.h | 3 +- libcef/browser/ssl_status_impl.cc | 5 +- libcef/browser/ssl_status_impl.h | 3 +- libcef/browser/stream_impl.cc | 4 +- libcef/browser/stream_impl.h | 4 +- libcef/browser/test/test_helpers_impl.cc | 3 +- libcef/browser/test/test_server_impl.cc | 5 +- libcef/browser/test/test_server_impl.h | 2 +- libcef/browser/trace_impl.cc | 9 +-- libcef/browser/trace_subscriber.cc | 6 +- libcef/browser/trace_subscriber.h | 3 +- .../browser/views/basic_label_button_impl.cc | 4 +- .../browser/views/basic_label_button_impl.h | 8 +- .../browser/views/basic_label_button_view.cc | 2 +- .../browser/views/basic_label_button_view.h | 6 +- libcef/browser/views/basic_panel_impl.cc | 4 +- libcef/browser/views/basic_panel_impl.h | 8 +- libcef/browser/views/basic_panel_view.cc | 2 +- libcef/browser/views/basic_panel_view.h | 5 +- libcef/browser/views/box_layout_impl.cc | 6 +- libcef/browser/views/box_layout_impl.h | 5 +- .../views/browser_platform_delegate_views.cc | 9 +-- .../views/browser_platform_delegate_views.h | 6 +- libcef/browser/views/browser_view_impl.cc | 21 +++--- libcef/browser/views/browser_view_impl.h | 13 ++-- libcef/browser/views/browser_view_view.cc | 4 +- libcef/browser/views/browser_view_view.h | 6 +- libcef/browser/views/button_impl.h | 8 +- libcef/browser/views/button_view.h | 8 +- .../browser/views/color_provider_tracker.cc | 2 +- libcef/browser/views/display_impl.cc | 5 +- libcef/browser/views/display_impl.h | 5 +- libcef/browser/views/fill_layout_impl.cc | 4 +- libcef/browser/views/fill_layout_impl.h | 5 +- libcef/browser/views/label_button_impl.h | 12 ++- libcef/browser/views/label_button_view.h | 5 +- libcef/browser/views/layout_adapter.cc | 6 +- libcef/browser/views/layout_adapter.h | 2 +- libcef/browser/views/layout_impl.h | 14 ++-- libcef/browser/views/layout_util.cc | 5 +- libcef/browser/views/layout_util.h | 3 +- libcef/browser/views/menu_button_impl.cc | 7 +- libcef/browser/views/menu_button_impl.h | 10 +-- libcef/browser/views/menu_button_view.cc | 5 +- libcef/browser/views/menu_button_view.h | 8 +- libcef/browser/views/menu_runner_views.cc | 6 +- libcef/browser/views/menu_runner_views.h | 2 +- libcef/browser/views/native_widget_mac.h | 3 +- libcef/browser/views/native_widget_mac.mm | 11 ++- libcef/browser/views/ns_window.h | 3 +- libcef/browser/views/ns_window.mm | 2 +- libcef/browser/views/overlay_view_host.cc | 7 +- libcef/browser/views/overlay_view_host.h | 5 +- libcef/browser/views/panel_impl.h | 18 ++--- libcef/browser/views/panel_view.h | 8 +- libcef/browser/views/scroll_view_impl.cc | 2 +- libcef/browser/views/scroll_view_impl.h | 9 +-- libcef/browser/views/scroll_view_view.cc | 2 +- libcef/browser/views/scroll_view_view.h | 6 +- libcef/browser/views/textfield_impl.cc | 4 +- libcef/browser/views/textfield_impl.h | 9 +-- libcef/browser/views/textfield_view.cc | 4 +- libcef/browser/views/textfield_view.h | 8 +- libcef/browser/views/view_adapter.cc | 20 ++--- libcef/browser/views/view_adapter.h | 3 +- libcef/browser/views/view_impl.h | 20 +++-- libcef/browser/views/view_util.cc | 9 +-- libcef/browser/views/view_util.h | 5 +- libcef/browser/views/view_util_aura.cc | 3 +- libcef/browser/views/view_util_mac.mm | 7 +- libcef/browser/views/view_view.h | 10 +-- libcef/browser/views/widget.cc | 10 +-- libcef/browser/views/widget_impl.cc | 9 +-- libcef/browser/views/widget_impl.h | 5 +- libcef/browser/views/window_impl.cc | 21 +++--- libcef/browser/views/window_impl.h | 12 ++- libcef/browser/views/window_view.cc | 13 ++-- libcef/browser/views/window_view.h | 12 ++- libcef/browser/x509_cert_principal_impl.cc | 2 +- libcef/browser/x509_cert_principal_impl.h | 3 +- libcef/browser/x509_certificate_impl.cc | 7 +- libcef/browser/x509_certificate_impl.h | 3 +- libcef/browser/xml_reader_impl.cc | 5 +- libcef/browser/xml_reader_impl.h | 3 +- libcef/browser/zip_reader_impl.cc | 6 +- libcef/browser/zip_reader_impl.h | 2 +- libcef/common/alloy/alloy_content_client.cc | 15 ++-- libcef/common/alloy/alloy_main_delegate.cc | 23 +++--- libcef/common/alloy/alloy_main_delegate.h | 13 ++-- .../alloy/alloy_main_runner_delegate.cc | 9 +-- .../common/alloy/alloy_main_runner_delegate.h | 6 +- libcef/common/app_manager.cc | 10 +-- libcef/common/app_manager.h | 5 +- libcef/common/base_impl.cc | 10 +-- libcef/common/cdm_host_file_path.cc | 4 +- .../common/cef_crash_report_upload_thread.cc | 4 +- libcef/common/cef_crash_report_utils.cc | 2 +- libcef/common/cef_switches.cc | 2 +- .../chrome/chrome_content_client_cef.cc | 7 +- .../common/chrome/chrome_main_delegate_cef.cc | 21 +++--- .../common/chrome/chrome_main_delegate_cef.h | 11 ++- .../chrome/chrome_main_runner_delegate.cc | 7 +- .../chrome/chrome_main_runner_delegate.h | 6 +- libcef/common/command_line_impl.cc | 2 +- libcef/common/command_line_impl.h | 5 +- libcef/common/crash_reporter_client.cc | 6 +- libcef/common/crash_reporter_client.h | 3 +- libcef/common/crash_reporting.cc | 11 ++- libcef/common/drag_data_impl.cc | 5 +- libcef/common/drag_data_impl.h | 5 +- .../extensions/chrome_generated_schemas.cc | 5 +- .../extensions/extensions_api_provider.cc | 5 +- libcef/common/extensions/extensions_client.cc | 7 +- libcef/common/extensions/extensions_util.cc | 7 +- libcef/common/file_util_impl.cc | 6 +- libcef/common/frame_util.cc | 5 +- libcef/common/frame_util.h | 1 + libcef/common/i18n_util_impl.cc | 3 +- libcef/common/json_impl.cc | 5 +- libcef/common/main_runner_delegate.h | 2 +- libcef/common/net/http_header_utils.cc | 2 +- libcef/common/net/http_header_utils.h | 2 +- libcef/common/net/net_resource_provider.cc | 2 +- libcef/common/net/scheme_registration.cc | 9 +-- libcef/common/net/url_util.cc | 2 +- libcef/common/net/url_util.h | 2 +- libcef/common/net_service/net_service_util.cc | 7 +- libcef/common/net_service/net_service_util.h | 3 +- libcef/common/parser_impl.cc | 3 +- libcef/common/process_message_impl.cc | 5 +- libcef/common/process_message_impl.h | 3 +- libcef/common/process_message_smr_impl.cc | 2 +- libcef/common/process_message_smr_impl.h | 5 +- libcef/common/request_impl.cc | 8 +- libcef/common/request_impl.h | 3 +- libcef/common/resource_bundle_delegate.cc | 4 +- libcef/common/resource_bundle_impl.cc | 2 +- libcef/common/resource_bundle_impl.h | 2 +- libcef/common/resource_util.cc | 4 +- libcef/common/resource_util.h | 3 +- libcef/common/response_impl.cc | 7 +- libcef/common/response_impl.h | 3 +- libcef/common/scheme_registrar_impl.cc | 9 +-- libcef/common/scheme_registrar_impl.h | 3 +- libcef/common/string_list_impl.cc | 3 +- libcef/common/string_map_impl.cc | 3 +- libcef/common/string_multimap_impl.cc | 3 +- libcef/common/string_types_impl.cc | 3 +- libcef/common/string_util.cc | 4 +- libcef/common/string_util.h | 3 +- libcef/common/task_impl.cc | 5 +- libcef/common/task_runner_impl.cc | 5 +- libcef/common/task_runner_impl.h | 3 +- libcef/common/task_runner_manager.cc | 2 +- libcef/common/test/translator_test_impl.cc | 2 +- libcef/common/thread_impl.cc | 5 +- libcef/common/thread_impl.h | 3 +- libcef/common/time_impl.cc | 8 +- libcef/common/time_util.h | 2 +- libcef/common/tracker.cc | 2 +- libcef/common/tracker.h | 3 +- libcef/common/urlrequest_impl.cc | 9 +-- libcef/common/util_linux.cc | 2 +- libcef/common/util_mac.mm | 5 +- libcef/common/value_base.cc | 2 +- libcef/common/value_base.h | 2 +- libcef/common/values_impl.cc | 2 +- libcef/common/values_impl.h | 5 +- libcef/common/waitable_event_impl.cc | 5 +- libcef/common/waitable_event_impl.h | 3 +- .../alloy/alloy_content_renderer_client.cc | 35 +++++---- .../alloy/alloy_content_renderer_client.h | 3 +- .../alloy/alloy_render_frame_observer.cc | 2 +- .../alloy/alloy_render_frame_observer.h | 3 +- .../alloy/alloy_render_thread_observer.cc | 5 +- .../url_loader_throttle_provider_impl.cc | 9 +-- libcef/renderer/blink_glue.cc | 3 +- libcef/renderer/blink_glue.h | 3 +- libcef/renderer/browser_impl.cc | 13 ++-- libcef/renderer/browser_impl.h | 7 +- .../chrome_content_renderer_client_cef.cc | 9 +-- libcef/renderer/dom_document_impl.cc | 6 +- libcef/renderer/dom_document_impl.h | 3 +- libcef/renderer/dom_node_impl.cc | 13 ++-- libcef/renderer/dom_node_impl.h | 2 +- .../extensions_renderer_api_provider.cc | 2 +- .../extensions_renderer_api_provider.h | 7 +- .../extensions/extensions_renderer_client.cc | 9 +-- libcef/renderer/frame_impl.cc | 31 ++++---- libcef/renderer/frame_impl.h | 7 +- libcef/renderer/render_frame_observer.cc | 14 ++-- libcef/renderer/render_frame_util.cc | 7 +- libcef/renderer/render_manager.cc | 21 +++--- libcef/renderer/render_manager.h | 3 +- libcef/renderer/thread_util.h | 3 +- libcef/renderer/v8_impl.cc | 20 +++-- libcef/renderer/v8_impl.h | 5 +- libcef_dll/base/cef_lock.cc | 1 + libcef_dll/base/cef_logging.cc | 1 + .../cpptoc/accessibility_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/app_cpptoc.cc | 1 + libcef_dll/cpptoc/audio_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/auth_callback_cpptoc.cc | 1 + .../cpptoc/before_download_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/binary_value_cpptoc.cc | 1 + libcef_dll/cpptoc/browser_cpptoc.cc | 1 + libcef_dll/cpptoc/browser_host_cpptoc.cc | 1 + .../cpptoc/browser_process_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/callback_cpptoc.cc | 1 + libcef_dll/cpptoc/client_cpptoc.cc | 1 + libcef_dll/cpptoc/command_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/command_line_cpptoc.cc | 1 + .../cpptoc/completion_callback_cpptoc.cc | 1 + .../cpptoc/context_menu_handler_cpptoc.cc | 1 + .../cpptoc/context_menu_params_cpptoc.cc | 1 + .../cpptoc/cookie_access_filter_cpptoc.cc | 1 + libcef_dll/cpptoc/cookie_manager_cpptoc.cc | 1 + libcef_dll/cpptoc/cookie_visitor_cpptoc.cc | 1 + .../cpptoc/delete_cookies_callback_cpptoc.cc | 1 + .../dev_tools_message_observer_cpptoc.cc | 1 + libcef_dll/cpptoc/dialog_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/dictionary_value_cpptoc.cc | 1 + libcef_dll/cpptoc/display_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/domdocument_cpptoc.cc | 1 + libcef_dll/cpptoc/domnode_cpptoc.cc | 1 + libcef_dll/cpptoc/domvisitor_cpptoc.cc | 1 + libcef_dll/cpptoc/download_handler_cpptoc.cc | 1 + .../cpptoc/download_image_callback_cpptoc.cc | 1 + .../cpptoc/download_item_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/download_item_cpptoc.cc | 1 + libcef_dll/cpptoc/drag_data_cpptoc.cc | 1 + libcef_dll/cpptoc/drag_handler_cpptoc.cc | 1 + .../cpptoc/end_tracing_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/extension_cpptoc.cc | 1 + libcef_dll/cpptoc/extension_handler_cpptoc.cc | 1 + .../cpptoc/file_dialog_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/find_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/focus_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/frame_cpptoc.cc | 1 + libcef_dll/cpptoc/frame_handler_cpptoc.cc | 1 + .../get_extension_resource_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/image_cpptoc.cc | 1 + libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/keyboard_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/life_span_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/list_value_cpptoc.cc | 1 + libcef_dll/cpptoc/load_handler_cpptoc.cc | 1 + .../cpptoc/media_access_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/media_observer_cpptoc.cc | 1 + libcef_dll/cpptoc/media_route_cpptoc.cc | 1 + .../media_route_create_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/media_router_cpptoc.cc | 1 + libcef_dll/cpptoc/media_sink_cpptoc.cc | 1 + .../media_sink_device_info_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/media_source_cpptoc.cc | 1 + libcef_dll/cpptoc/menu_model_cpptoc.cc | 1 + .../cpptoc/menu_model_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/navigation_entry_cpptoc.cc | 1 + .../cpptoc/navigation_entry_visitor_cpptoc.cc | 1 + .../cpptoc/pdf_print_callback_cpptoc.cc | 1 + .../cpptoc/permission_handler_cpptoc.cc | 1 + .../permission_prompt_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/post_data_cpptoc.cc | 2 + .../cpptoc/preference_manager_cpptoc.cc | 1 + .../cpptoc/preference_registrar_cpptoc.cc | 1 + .../cpptoc/print_dialog_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/print_handler_cpptoc.cc | 1 + .../cpptoc/print_job_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/print_settings_cpptoc.cc | 2 + libcef_dll/cpptoc/process_message_cpptoc.cc | 1 + libcef_dll/cpptoc/read_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/registration_cpptoc.cc | 1 + libcef_dll/cpptoc/render_handler_cpptoc.cc | 1 + .../cpptoc/render_process_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/request_context_cpptoc.cc | 1 + .../cpptoc/request_context_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/request_cpptoc.cc | 1 + libcef_dll/cpptoc/request_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/resolve_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/resource_bundle_cpptoc.cc | 1 + .../cpptoc/resource_bundle_handler_cpptoc.cc | 1 + libcef_dll/cpptoc/resource_handler_cpptoc.cc | 1 + .../cpptoc/resource_read_callback_cpptoc.cc | 1 + .../cpptoc/resource_request_handler_cpptoc.cc | 1 + .../cpptoc/resource_skip_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/response_cpptoc.cc | 1 + libcef_dll/cpptoc/response_filter_cpptoc.cc | 1 + .../run_context_menu_callback_cpptoc.cc | 1 + .../cpptoc/run_file_dialog_callback_cpptoc.cc | 1 + .../cpptoc/run_quick_menu_callback_cpptoc.cc | 1 + .../cpptoc/scheme_handler_factory_cpptoc.cc | 1 + ...lect_client_certificate_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/server_cpptoc.cc | 1 + libcef_dll/cpptoc/server_handler_cpptoc.cc | 1 + .../cpptoc/set_cookie_callback_cpptoc.cc | 1 + .../cpptoc/shared_memory_region_cpptoc.cc | 1 + .../shared_process_message_builder_cpptoc.cc | 1 + libcef_dll/cpptoc/sslinfo_cpptoc.cc | 1 + libcef_dll/cpptoc/sslstatus_cpptoc.cc | 1 + libcef_dll/cpptoc/stream_reader_cpptoc.cc | 1 + libcef_dll/cpptoc/stream_writer_cpptoc.cc | 1 + libcef_dll/cpptoc/string_visitor_cpptoc.cc | 1 + libcef_dll/cpptoc/task_runner_cpptoc.cc | 1 + .../test/test_server_connection_cpptoc.cc | 1 + libcef_dll/cpptoc/test/test_server_cpptoc.cc | 1 + .../cpptoc/test/test_server_handler_cpptoc.cc | 1 + .../cpptoc/test/translator_test_cpptoc.cc | 2 + ...slator_test_ref_ptr_client_child_cpptoc.cc | 1 + .../translator_test_ref_ptr_client_cpptoc.cc | 1 + ...test_ref_ptr_library_child_child_cpptoc.cc | 1 + ...lator_test_ref_ptr_library_child_cpptoc.cc | 1 + .../translator_test_ref_ptr_library_cpptoc.cc | 1 + .../translator_test_scoped_client_cpptoc.cc | 1 + ...slator_test_scoped_library_child_cpptoc.cc | 1 + .../translator_test_scoped_library_cpptoc.cc | 1 + libcef_dll/cpptoc/thread_cpptoc.cc | 1 + .../unresponsive_process_callback_cpptoc.cc | 1 + libcef_dll/cpptoc/urlrequest_client_cpptoc.cc | 1 + libcef_dll/cpptoc/urlrequest_cpptoc.cc | 1 + libcef_dll/cpptoc/v8accessor_cpptoc.cc | 1 + libcef_dll/cpptoc/v8context_cpptoc.cc | 1 + libcef_dll/cpptoc/v8handler_cpptoc.cc | 1 + libcef_dll/cpptoc/v8interceptor_cpptoc.cc | 1 + libcef_dll/cpptoc/v8stack_trace_cpptoc.cc | 1 + libcef_dll/cpptoc/v8value_cpptoc.cc | 1 + libcef_dll/cpptoc/value_cpptoc.cc | 1 + libcef_dll/cpptoc/views/box_layout_cpptoc.cc | 1 + .../cpptoc/views/browser_view_cpptoc.cc | 1 + .../views/browser_view_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/views/button_cpptoc.cc | 1 + .../cpptoc/views/button_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/views/display_cpptoc.cc | 2 + libcef_dll/cpptoc/views/fill_layout_cpptoc.cc | 1 + .../cpptoc/views/label_button_cpptoc.cc | 1 + libcef_dll/cpptoc/views/layout_cpptoc.cc | 1 + libcef_dll/cpptoc/views/menu_button_cpptoc.cc | 1 + .../views/menu_button_delegate_cpptoc.cc | 1 + .../views/menu_button_pressed_lock_cpptoc.cc | 1 + .../cpptoc/views/overlay_controller_cpptoc.cc | 1 + libcef_dll/cpptoc/views/panel_cpptoc.cc | 1 + .../cpptoc/views/panel_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/views/scroll_view_cpptoc.cc | 1 + libcef_dll/cpptoc/views/textfield_cpptoc.cc | 1 + .../cpptoc/views/textfield_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/views/view_cpptoc.cc | 1 + .../cpptoc/views/view_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/views/window_cpptoc.cc | 1 + .../cpptoc/views/window_delegate_cpptoc.cc | 1 + libcef_dll/cpptoc/waitable_event_cpptoc.cc | 1 + libcef_dll/cpptoc/write_handler_cpptoc.cc | 1 + .../cpptoc/x509cert_principal_cpptoc.cc | 1 + libcef_dll/cpptoc/x509certificate_cpptoc.cc | 2 + libcef_dll/cpptoc/xml_reader_cpptoc.cc | 1 + libcef_dll/cpptoc/zip_reader_cpptoc.cc | 1 + .../ctocpp/accessibility_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/app_ctocpp.cc | 1 + libcef_dll/ctocpp/audio_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/auth_callback_ctocpp.cc | 1 + .../ctocpp/before_download_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/binary_value_ctocpp.cc | 1 + libcef_dll/ctocpp/browser_ctocpp.cc | 1 + libcef_dll/ctocpp/browser_ctocpp.h | 1 + libcef_dll/ctocpp/browser_host_ctocpp.cc | 1 + libcef_dll/ctocpp/browser_host_ctocpp.h | 1 + .../ctocpp/browser_process_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/callback_ctocpp.cc | 1 + libcef_dll/ctocpp/client_ctocpp.cc | 1 + libcef_dll/ctocpp/command_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/command_line_ctocpp.cc | 1 + libcef_dll/ctocpp/command_line_ctocpp.h | 1 + .../ctocpp/completion_callback_ctocpp.cc | 1 + .../ctocpp/context_menu_handler_ctocpp.cc | 1 + .../ctocpp/context_menu_params_ctocpp.cc | 1 + .../ctocpp/context_menu_params_ctocpp.h | 1 + .../ctocpp/cookie_access_filter_ctocpp.cc | 1 + libcef_dll/ctocpp/cookie_manager_ctocpp.cc | 1 + libcef_dll/ctocpp/cookie_visitor_ctocpp.cc | 1 + .../ctocpp/delete_cookies_callback_ctocpp.cc | 1 + .../dev_tools_message_observer_ctocpp.cc | 1 + libcef_dll/ctocpp/dialog_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/dialog_handler_ctocpp.h | 1 + libcef_dll/ctocpp/dictionary_value_ctocpp.cc | 1 + libcef_dll/ctocpp/display_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/display_handler_ctocpp.h | 1 + libcef_dll/ctocpp/domdocument_ctocpp.cc | 1 + libcef_dll/ctocpp/domnode_ctocpp.cc | 1 + libcef_dll/ctocpp/domvisitor_ctocpp.cc | 1 + libcef_dll/ctocpp/download_handler_ctocpp.cc | 1 + .../ctocpp/download_image_callback_ctocpp.cc | 1 + .../ctocpp/download_item_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/download_item_ctocpp.cc | 1 + libcef_dll/ctocpp/drag_data_ctocpp.cc | 1 + libcef_dll/ctocpp/drag_data_ctocpp.h | 1 + libcef_dll/ctocpp/drag_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/drag_handler_ctocpp.h | 1 + .../ctocpp/end_tracing_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/extension_ctocpp.cc | 1 + libcef_dll/ctocpp/extension_handler_ctocpp.cc | 1 + .../ctocpp/file_dialog_callback_ctocpp.cc | 1 + .../ctocpp/file_dialog_callback_ctocpp.h | 1 + libcef_dll/ctocpp/find_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/focus_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/frame_ctocpp.cc | 1 + libcef_dll/ctocpp/frame_handler_ctocpp.cc | 1 + .../get_extension_resource_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/image_ctocpp.cc | 1 + libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/keyboard_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/life_span_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/list_value_ctocpp.cc | 1 + libcef_dll/ctocpp/load_handler_ctocpp.cc | 1 + .../ctocpp/media_access_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/media_observer_ctocpp.cc | 1 + libcef_dll/ctocpp/media_observer_ctocpp.h | 1 + .../media_route_create_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/media_route_ctocpp.cc | 1 + libcef_dll/ctocpp/media_router_ctocpp.cc | 1 + libcef_dll/ctocpp/media_sink_ctocpp.cc | 1 + .../media_sink_device_info_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/media_source_ctocpp.cc | 1 + libcef_dll/ctocpp/menu_model_ctocpp.cc | 1 + .../ctocpp/menu_model_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/navigation_entry_ctocpp.cc | 1 + .../ctocpp/navigation_entry_visitor_ctocpp.cc | 1 + .../ctocpp/pdf_print_callback_ctocpp.cc | 1 + .../ctocpp/permission_handler_ctocpp.cc | 1 + .../permission_prompt_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/post_data_ctocpp.cc | 2 + .../ctocpp/preference_manager_ctocpp.cc | 1 + .../ctocpp/preference_registrar_ctocpp.cc | 1 + .../ctocpp/print_dialog_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/print_handler_ctocpp.cc | 1 + .../ctocpp/print_job_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/print_settings_ctocpp.cc | 2 + libcef_dll/ctocpp/process_message_ctocpp.cc | 1 + libcef_dll/ctocpp/read_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/registration_ctocpp.cc | 1 + libcef_dll/ctocpp/render_handler_ctocpp.cc | 1 + .../ctocpp/render_process_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/request_context_ctocpp.cc | 1 + libcef_dll/ctocpp/request_context_ctocpp.h | 1 + .../ctocpp/request_context_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/request_ctocpp.cc | 1 + libcef_dll/ctocpp/request_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/resolve_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/resolve_callback_ctocpp.h | 1 + libcef_dll/ctocpp/resource_bundle_ctocpp.cc | 1 + .../ctocpp/resource_bundle_handler_ctocpp.cc | 1 + libcef_dll/ctocpp/resource_handler_ctocpp.cc | 1 + .../ctocpp/resource_read_callback_ctocpp.cc | 1 + .../ctocpp/resource_request_handler_ctocpp.cc | 1 + .../ctocpp/resource_skip_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/response_ctocpp.cc | 1 + libcef_dll/ctocpp/response_filter_ctocpp.cc | 1 + .../run_context_menu_callback_ctocpp.cc | 1 + .../ctocpp/run_file_dialog_callback_ctocpp.cc | 1 + .../ctocpp/run_file_dialog_callback_ctocpp.h | 1 + .../ctocpp/run_quick_menu_callback_ctocpp.cc | 1 + .../ctocpp/scheme_handler_factory_ctocpp.cc | 1 + ...lect_client_certificate_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/server_ctocpp.cc | 1 + libcef_dll/ctocpp/server_handler_ctocpp.cc | 1 + .../ctocpp/set_cookie_callback_ctocpp.cc | 1 + .../ctocpp/shared_memory_region_ctocpp.cc | 1 + .../shared_process_message_builder_ctocpp.cc | 1 + libcef_dll/ctocpp/sslinfo_ctocpp.cc | 1 + libcef_dll/ctocpp/sslstatus_ctocpp.cc | 1 + libcef_dll/ctocpp/stream_reader_ctocpp.cc | 1 + libcef_dll/ctocpp/stream_writer_ctocpp.cc | 1 + libcef_dll/ctocpp/string_visitor_ctocpp.cc | 1 + libcef_dll/ctocpp/task_runner_ctocpp.cc | 1 + .../test/test_server_connection_ctocpp.cc | 1 + libcef_dll/ctocpp/test/test_server_ctocpp.cc | 1 + .../ctocpp/test/test_server_handler_ctocpp.cc | 1 + .../ctocpp/test/translator_test_ctocpp.cc | 2 + .../ctocpp/test/translator_test_ctocpp.h | 1 + ...slator_test_ref_ptr_client_child_ctocpp.cc | 1 + .../translator_test_ref_ptr_client_ctocpp.cc | 1 + ...test_ref_ptr_library_child_child_ctocpp.cc | 1 + ...lator_test_ref_ptr_library_child_ctocpp.cc | 1 + .../translator_test_ref_ptr_library_ctocpp.cc | 1 + .../translator_test_scoped_client_ctocpp.cc | 1 + ...slator_test_scoped_library_child_ctocpp.cc | 1 + .../translator_test_scoped_library_ctocpp.cc | 1 + libcef_dll/ctocpp/thread_ctocpp.cc | 1 + .../unresponsive_process_callback_ctocpp.cc | 1 + libcef_dll/ctocpp/urlrequest_client_ctocpp.cc | 1 + libcef_dll/ctocpp/urlrequest_ctocpp.cc | 1 + libcef_dll/ctocpp/v8accessor_ctocpp.cc | 1 + libcef_dll/ctocpp/v8context_ctocpp.cc | 1 + libcef_dll/ctocpp/v8handler_ctocpp.cc | 1 + libcef_dll/ctocpp/v8interceptor_ctocpp.cc | 1 + libcef_dll/ctocpp/v8stack_trace_ctocpp.cc | 1 + libcef_dll/ctocpp/v8value_ctocpp.cc | 1 + libcef_dll/ctocpp/v8value_ctocpp.h | 1 + libcef_dll/ctocpp/value_ctocpp.cc | 1 + libcef_dll/ctocpp/views/box_layout_ctocpp.cc | 1 + .../ctocpp/views/browser_view_ctocpp.cc | 1 + .../views/browser_view_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/views/button_ctocpp.cc | 1 + .../ctocpp/views/button_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/views/display_ctocpp.cc | 2 + libcef_dll/ctocpp/views/fill_layout_ctocpp.cc | 1 + .../ctocpp/views/label_button_ctocpp.cc | 1 + libcef_dll/ctocpp/views/layout_ctocpp.cc | 1 + libcef_dll/ctocpp/views/menu_button_ctocpp.cc | 1 + .../views/menu_button_delegate_ctocpp.cc | 1 + .../views/menu_button_pressed_lock_ctocpp.cc | 1 + .../ctocpp/views/overlay_controller_ctocpp.cc | 1 + libcef_dll/ctocpp/views/panel_ctocpp.cc | 1 + .../ctocpp/views/panel_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/views/scroll_view_ctocpp.cc | 1 + libcef_dll/ctocpp/views/textfield_ctocpp.cc | 1 + .../ctocpp/views/textfield_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/views/view_ctocpp.cc | 1 + .../ctocpp/views/view_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/views/window_ctocpp.cc | 1 + libcef_dll/ctocpp/views/window_ctocpp.h | 1 + .../ctocpp/views/window_delegate_ctocpp.cc | 1 + libcef_dll/ctocpp/waitable_event_ctocpp.cc | 1 + libcef_dll/ctocpp/write_handler_ctocpp.cc | 1 + .../ctocpp/x509cert_principal_ctocpp.cc | 1 + libcef_dll/ctocpp/x509cert_principal_ctocpp.h | 1 + libcef_dll/ctocpp/x509certificate_ctocpp.cc | 2 + libcef_dll/ctocpp/xml_reader_ctocpp.cc | 1 + libcef_dll/ctocpp/zip_reader_ctocpp.cc | 1 + libcef_dll/sandbox/sandbox_mac.mm | 3 +- libcef_dll/sandbox/sandbox_win.cc | 4 +- .../wrapper/cef_message_router_utils.cc | 4 +- patch/patch.cfg | 6 -- patch/patches/clang_format_includes.patch | 48 ------------ .../browser/browser_window_osr_gtk.h | 1 - .../browser/browser_window_osr_mac.mm | 3 +- .../browser/browser_window_std_gtk.cc | 3 +- .../browser/client_app_delegates_browser.cc | 3 +- tests/cefclient/browser/client_browser.cc | 1 - tests/cefclient/browser/client_handler.cc | 1 + .../main_message_loop_multithreaded_gtk.h | 4 +- .../main_message_loop_multithreaded_win.h | 1 + .../browser/osr_accessibility_helper.cc | 1 + .../browser/osr_accessibility_node_win.cc | 2 + .../cefclient/browser/osr_ime_handler_win.cc | 3 +- tests/cefclient/browser/osr_ime_handler_win.h | 1 + tests/cefclient/browser/print_handler_gtk.cc | 7 +- tests/cefclient/browser/root_window.cc | 1 - tests/cefclient/browser/root_window_create.cc | 1 - tests/cefclient/browser/root_window_gtk.cc | 3 +- tests/cefclient/browser/root_window_gtk.h | 1 + .../browser/text_input_client_osr_mac.h | 1 + .../browser/text_input_client_osr_mac.mm | 1 + tests/cefclient/browser/views_window_mac.mm | 2 +- tests/cefclient/browser/window_test.cc | 1 - tests/cefclient/browser/window_test_runner.h | 4 +- .../browser/window_test_runner_views.cc | 1 - tests/cefclient/cefclient_gtk.cc | 4 +- tests/cefclient/cefclient_mac.mm | 1 + .../renderer/performance_test_tests.cc | 3 +- tests/cefsimple/simple_handler.h | 4 +- tests/cefsimple/simple_handler_win.cc | 1 + tests/ceftests/devtools_message_unittest.cc | 1 - .../extensions/background_unittest.cc | 1 - .../extensions/chrome_tabs_unittest.cc | 4 +- tests/ceftests/extensions/view_unittest.cc | 1 - tests/ceftests/file_util_unittest.cc | 3 +- tests/ceftests/os_rendering_unittest.cc | 1 + tests/ceftests/os_rendering_unittest_mac.mm | 4 +- tests/ceftests/osr_display_unittest.cc | 1 - tests/ceftests/resource_util_win_dir.cc | 3 +- tests/ceftests/routing_test_handler.cc | 1 + .../send_shared_process_message_unittest.cc | 4 +- .../shared_process_message_unittest.cc | 7 +- tests/ceftests/test_server.cc | 4 +- tests/ceftests/test_server_observer.cc | 5 +- .../ceftests/test_server_observer_unittest.cc | 3 +- tests/ceftests/test_server_runner.cc | 3 +- tests/ceftests/test_server_runner_normal.cc | 3 +- tests/ceftests/views/test_window_delegate.cc | 1 + tests/shared/browser/resource_util.h | 1 + tests/shared/browser/util_win.h | 1 + tests/shared/common/binary_value_utils.h | 1 + tests/shared/process_helper_mac.cc | 1 - tools/cef_api_hash.py | 1 - tools/make_distrib.py | 5 +- 877 files changed, 1921 insertions(+), 1955 deletions(-) delete mode 100644 patch/patches/clang_format_includes.patch diff --git a/BUILD.gn b/BUILD.gn index eda75b11a..c2916a17c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1255,7 +1255,7 @@ config("libcef_dll_wrapper_config") { ".", # CEF generates some header files that also need to be discoverable. # They will be copied to the include/ directory in the binary distribution. - "$root_out_dir/includes", + "$root_out_dir/includes/cef", ] configs = [ ":libcef_autogen_config" ] @@ -1380,7 +1380,7 @@ template("make_pack_header") { # Generate cef_pack_resources.h. make_pack_header("resources") { - header = "$root_out_dir/includes/include/cef_pack_resources.h" + header = "$root_out_dir/includes/cef/include/cef_pack_resources.h" inputs = [ "$root_gen_dir/base/tracing/protos/grit/tracing_proto_resources.h", "$root_gen_dir/cef/grit/cef_resources.h", @@ -1444,7 +1444,7 @@ make_pack_header("resources") { # Generate cef_pack_strings.h. make_pack_header("strings") { - header = "$root_out_dir/includes/include/cef_pack_strings.h" + header = "$root_out_dir/includes/cef/include/cef_pack_strings.h" inputs = [ "$root_gen_dir/cef/grit/cef_strings.h", "$root_gen_dir/chrome/grit/branded_strings.h", @@ -1482,7 +1482,7 @@ make_pack_header("strings") { # Generate cef_command_ids.h. make_pack_header("command_ids") { - header = "$root_out_dir/includes/include/cef_command_ids.h" + header = "$root_out_dir/includes/cef/include/cef_command_ids.h" inputs = [ "//chrome/app/chrome_command_ids.h", ] @@ -1500,7 +1500,7 @@ action("make_api_hash_header") { gypi_paths2.includes_capi + gypi_paths.autogen_capi_includes include_dir = [ "include" ] - outputs = [ "$root_out_dir/includes/include/cef_api_hash.h" ] + outputs = [ "$root_out_dir/includes/cef/include/cef_api_hash.h" ] args = rebase_path(outputs + include_dir, root_build_dir) } @@ -1509,7 +1509,7 @@ action("make_api_hash_header") { action("make_config_header") { script = "tools/make_config_header.py" - outputs = [ "$root_out_dir/includes/include/cef_config.h" ] + outputs = [ "$root_out_dir/includes/cef/include/cef_config.h" ] args = rebase_path(outputs + [ "$root_out_dir/args.gn" ], root_build_dir) } @@ -1523,7 +1523,7 @@ action("make_colorids_header") { "//components/color/color_id.h", "//chrome/browser/ui/color/chrome_color_id.h", ] - outputs = [ "$root_out_dir/includes/include/cef_color_ids.h" ] + outputs = [ "$root_out_dir/includes/cef/include/cef_color_ids.h" ] args = rebase_path(outputs + inputs, root_build_dir) } diff --git a/include/base/cef_build.h b/include/base/cef_build.h index c696f7536..6f20639a9 100644 --- a/include/base/cef_build.h +++ b/include/base/cef_build.h @@ -69,7 +69,6 @@ #if defined(USING_CHROMIUM_INCLUDES) // When building CEF include the Chromium header directly. #include "build/build_config.h" - #include "cef/libcef/features/features.h" #if !BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) diff --git a/include/base/cef_tuple.h b/include/base/cef_tuple.h index ae438d39e..ff20323a6 100644 --- a/include/base/cef_tuple.h +++ b/include/base/cef_tuple.h @@ -66,6 +66,7 @@ // updated to match. #include + #include #include diff --git a/include/cef_browser.h b/include/cef_browser.h index ee7492e32..c2e8d9435 100644 --- a/include/cef_browser.h +++ b/include/cef_browser.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_devtools_message_observer.h" #include "include/cef_drag_data.h" diff --git a/include/cef_command_line.h b/include/cef_command_line.h index 9ae6ee644..27691ed48 100644 --- a/include/cef_command_line.h +++ b/include/cef_command_line.h @@ -40,6 +40,7 @@ #include #include + #include "include/cef_base.h" /// diff --git a/include/cef_cookie.h b/include/cef_cookie.h index e3a682077..40570d81b 100644 --- a/include/cef_cookie.h +++ b/include/cef_cookie.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_callback.h" diff --git a/include/cef_dom.h b/include/cef_dom.h index 8ddb8f646..21fa3f4ec 100644 --- a/include/cef_dom.h +++ b/include/cef_dom.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" class CefDOMDocument; diff --git a/include/cef_drag_data.h b/include/cef_drag_data.h index 735a64c4d..382047b96 100644 --- a/include/cef_drag_data.h +++ b/include/cef_drag_data.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_image.h" #include "include/cef_stream.h" diff --git a/include/cef_media_router.h b/include/cef_media_router.h index a6bbf27ae..0550c2a55 100644 --- a/include/cef_media_router.h +++ b/include/cef_media_router.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_callback.h" #include "include/cef_registration.h" diff --git a/include/cef_request.h b/include/cef_request.h index 5f5a440ff..73610d98e 100644 --- a/include/cef_request.h +++ b/include/cef_request.h @@ -40,6 +40,7 @@ #include #include + #include "include/cef_base.h" class CefPostData; diff --git a/include/cef_response.h b/include/cef_response.h index 571998a46..81d2e8210 100644 --- a/include/cef_response.h +++ b/include/cef_response.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" /// diff --git a/include/cef_server.h b/include/cef_server.h index b868581fa..07b603e19 100644 --- a/include/cef_server.h +++ b/include/cef_server.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_callback.h" #include "include/cef_request.h" diff --git a/include/cef_ssl_info.h b/include/cef_ssl_info.h index 67b9cdfd9..f3f04e9d7 100644 --- a/include/cef_ssl_info.h +++ b/include/cef_ssl_info.h @@ -40,7 +40,6 @@ #include "include/cef_base.h" #include "include/cef_values.h" - #include "include/cef_x509_certificate.h" /// diff --git a/include/cef_v8.h b/include/cef_v8.h index f6a01c1e7..04b592d78 100644 --- a/include/cef_v8.h +++ b/include/cef_v8.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" #include "include/cef_browser.h" #include "include/cef_frame.h" diff --git a/include/cef_values.h b/include/cef_values.h index f7bcb79c7..98bd3b38a 100644 --- a/include/cef_values.h +++ b/include/cef_values.h @@ -39,6 +39,7 @@ #pragma once #include + #include "include/cef_base.h" class CefBinaryValue; diff --git a/include/test/cef_test_server.h b/include/test/cef_test_server.h index 80a59e15e..6f6f46674 100644 --- a/include/test/cef_test_server.h +++ b/include/test/cef_test_server.h @@ -49,6 +49,7 @@ #endif #include + #include "include/cef_base.h" #include "include/cef_request.h" diff --git a/libcef/browser/alloy/alloy_browser_context.cc b/libcef/browser/alloy/alloy_browser_context.cc index cf26722e0..cd4c3d016 100644 --- a/libcef/browser/alloy/alloy_browser_context.cc +++ b/libcef/browser/alloy/alloy_browser_context.cc @@ -2,25 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_browser_context.h" +#include "cef/libcef/browser/alloy/alloy_browser_context.h" #include #include #include -#include "libcef/browser/alloy/alloy_download_manager_delegate.h" -#include "libcef/browser/extensions/extension_system.h" -#include "libcef/browser/prefs/browser_prefs.h" -#include "libcef/browser/ssl_host_state_delegate.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_util.h" - #include "base/command_line.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/string_util.h" +#include "cef/libcef/browser/alloy/alloy_download_manager_delegate.h" +#include "cef/libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/ssl_host_state_delegate.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "chrome/browser/font_family_cache.h" #include "chrome/browser/permissions/permission_manager_factory.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" diff --git a/libcef/browser/alloy/alloy_browser_context.h b/libcef/browser/alloy/alloy_browser_context.h index 5fafd328c..9ad86a1e7 100644 --- a/libcef/browser/alloy/alloy_browser_context.h +++ b/libcef/browser/alloy/alloy_browser_context.h @@ -6,11 +6,10 @@ #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_ #pragma once -#include "include/cef_request_context_handler.h" -#include "libcef/browser/alloy/chrome_profile_alloy.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/request_context_handler_map.h" - +#include "cef/include/cef_request_context_handler.h" +#include "cef/libcef/browser/alloy/chrome_profile_alloy.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/request_context_handler_map.h" #include "chrome/browser/download/download_prefs.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/visitedlink/browser/visitedlink_delegate.h" diff --git a/libcef/browser/alloy/alloy_browser_host_impl.cc b/libcef/browser/alloy/alloy_browser_host_impl.cc index a22a79eac..0d520e7b4 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.cc +++ b/libcef/browser/alloy/alloy_browser_host_impl.cc @@ -3,36 +3,35 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include #include #include -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" -#include "libcef/browser/audio_capturer.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/browser_info.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/context.h" -#include "libcef/browser/extensions/browser_extensions_util.h" -#include "libcef/browser/hang_monitor.h" -#include "libcef/browser/media_access_query.h" -#include "libcef/browser/osr/osr_util.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/drag_data_impl.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/net/url_util.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/values_impl.h" -#include "libcef/features/runtime.h" - #include "base/command_line.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/audio_capturer.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/browser_info.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/hang_monitor.h" +#include "cef/libcef/browser/media_access_query.h" +#include "cef/libcef/browser/osr/osr_util.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/drag_data_impl.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/net/url_util.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/values_impl.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h" #include "components/zoom/page_zoom.h" diff --git a/libcef/browser/alloy/alloy_browser_host_impl.h b/libcef/browser/alloy/alloy_browser_host_impl.h index 5535490ca..67fc4ce8d 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.h +++ b/libcef/browser/alloy/alloy_browser_host_impl.h @@ -11,17 +11,16 @@ #include #include -#include "include/cef_browser.h" -#include "include/cef_client.h" -#include "include/cef_frame.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info.h" -#include "libcef/browser/frame_host_impl.h" -#include "libcef/browser/javascript_dialog_manager.h" -#include "libcef/browser/menu_manager.h" -#include "libcef/browser/request_context_impl.h" - #include "base/synchronization/lock.h" +#include "cef/include/cef_browser.h" +#include "cef/include/cef_client.h" +#include "cef/include/cef_frame.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/browser/javascript_dialog_manager.h" +#include "cef/libcef/browser/menu_manager.h" +#include "cef/libcef/browser/request_context_impl.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" diff --git a/libcef/browser/alloy/alloy_browser_main.cc b/libcef/browser/alloy/alloy_browser_main.cc index b6b2ce4dd..0e1a0aa74 100644 --- a/libcef/browser/alloy/alloy_browser_main.cc +++ b/libcef/browser/alloy/alloy_browser_main.cc @@ -2,32 +2,31 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_browser_main.h" +#include "cef/libcef/browser/alloy/alloy_browser_main.h" #include #include #include -#include "libcef/browser/alloy/devtools/devtools_manager_delegate.h" -#include "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/browser_context_keyed_service_factories.h" -#include "libcef/browser/context.h" -#include "libcef/browser/extensions/extension_system_factory.h" -#include "libcef/browser/file_dialog_runner.h" -#include "libcef/browser/net/chrome_scheme_handler.h" -#include "libcef/browser/permission_prompt.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/command_line_impl.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/net/net_resource_provider.h" - #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/task/thread_pool.h" +#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/browser_context_keyed_service_factories.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/extensions/extension_system_factory.h" +#include "cef/libcef/browser/file_dialog_runner.h" +#include "cef/libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/permission_prompt.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/command_line_impl.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/net/net_resource_provider.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_process_singleton.h" #include "chrome/browser/media/router/chrome_media_router_factory.h" @@ -90,11 +89,11 @@ #if BUILDFLAG(IS_LINUX) #include "base/path_service.h" +#include "cef/libcef/browser/printing/print_dialog_linux.h" #include "chrome/browser/themes/theme_service_aura_linux.h" #include "chrome/browser/ui/views/theme_profile_key.h" #include "chrome/grit/branded_strings.h" #include "components/os_crypt/sync/key_storage_config_linux.h" -#include "libcef/browser/printing/print_dialog_linux.h" #include "ui/base/cursor/cursor_factory.h" #include "ui/base/ime/input_method.h" #include "ui/base/l10n/l10n_util.h" diff --git a/libcef/browser/alloy/alloy_browser_main.h b/libcef/browser/alloy/alloy_browser_main.h index 5ecd68f77..936816fc9 100644 --- a/libcef/browser/alloy/alloy_browser_main.h +++ b/libcef/browser/alloy/alloy_browser_main.h @@ -8,10 +8,9 @@ #include -#include "libcef/browser/request_context_impl.h" - #include "base/command_line.h" #include "build/build_config.h" +#include "cef/libcef/browser/request_context_impl.h" #include "components/prefs/pref_service.h" #include "content/public/browser/browser_main_parts.h" #include "ui/display/screen.h" diff --git a/libcef/browser/alloy/alloy_browser_main_win.cc b/libcef/browser/alloy/alloy_browser_main_win.cc index ac3cbc140..4688f2e71 100644 --- a/libcef/browser/alloy/alloy_browser_main_win.cc +++ b/libcef/browser/alloy/alloy_browser_main_win.cc @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "cef/libcef/browser/alloy/alloy_browser_main.h" + #include -#include + #include -#include "libcef/browser/alloy/alloy_browser_main.h" +#include #include "base/logging.h" diff --git a/libcef/browser/alloy/alloy_content_browser_client.cc b/libcef/browser/alloy/alloy_content_browser_client.cc index 75ec51ec9..d3ceedbd5 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.cc +++ b/libcef/browser/alloy/alloy_content_browser_client.cc @@ -2,48 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_content_browser_client.h" +#include "cef/libcef/browser/alloy/alloy_content_browser_client.h" #include #include #include -#include "include/cef_version.h" -#include "libcef/browser/alloy/alloy_browser_context.h" -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/alloy/alloy_browser_main.h" -#include "libcef/browser/alloy/alloy_web_contents_view_delegate.h" -#include "libcef/browser/alloy/devtools/devtools_manager_delegate.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/browser_frame.h" -#include "libcef/browser/browser_info.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/browser_manager.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/certificate_query.h" -#include "libcef/browser/context.h" -#include "libcef/browser/extensions/extension_system.h" -#include "libcef/browser/extensions/extension_web_contents_observer.h" -#include "libcef/browser/media_capture_devices_dispatcher.h" -#include "libcef/browser/net/chrome_scheme_handler.h" -#include "libcef/browser/net/throttle_handler.h" -#include "libcef/browser/net_service/cookie_manager_impl.h" -#include "libcef/browser/net_service/login_delegate.h" -#include "libcef/browser/net_service/proxy_url_loader_factory.h" -#include "libcef/browser/net_service/resource_request_handler_wrapper.h" -#include "libcef/browser/prefs/renderer_prefs.h" -#include "libcef/browser/speech_recognition_manager_delegate.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/x509_certificate_impl.h" -#include "libcef/common/alloy/alloy_content_client.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/command_line_impl.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/net/scheme_registration.h" -#include "libcef/common/request_impl.h" - #include "base/base_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -52,6 +16,41 @@ #include "base/stl_util.h" #include "base/threading/thread_restrictions.h" #include "cef/grit/cef_resources.h" +#include "cef/include/cef_version.h" +#include "cef/libcef/browser/alloy/alloy_browser_context.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/alloy/alloy_browser_main.h" +#include "cef/libcef/browser/alloy/alloy_web_contents_view_delegate.h" +#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/browser_frame.h" +#include "cef/libcef/browser/browser_info.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_manager.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/certificate_query.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/browser/media_capture_devices_dispatcher.h" +#include "cef/libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/net/throttle_handler.h" +#include "cef/libcef/browser/net_service/cookie_manager_impl.h" +#include "cef/libcef/browser/net_service/login_delegate.h" +#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h" +#include "cef/libcef/browser/net_service/resource_request_handler_wrapper.h" +#include "cef/libcef/browser/prefs/renderer_prefs.h" +#include "cef/libcef/browser/speech_recognition_manager_delegate.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/x509_certificate_impl.h" +#include "cef/libcef/common/alloy/alloy_content_client.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/command_line_impl.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/net/scheme_registration.h" +#include "cef/libcef/common/request_impl.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" @@ -161,10 +160,10 @@ #include "net/ssl/client_cert_store_mac.h" #include "services/video_capture/public/mojom/constants.mojom.h" #elif BUILDFLAG(IS_POSIX) +#include "cef/libcef/common/crash_reporting.h" #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #include "content/public/common/content_descriptors.h" -#include "libcef/common/crash_reporting.h" #endif #if BUILDFLAG(IS_WIN) diff --git a/libcef/browser/alloy/alloy_content_browser_client.h b/libcef/browser/alloy/alloy_content_browser_client.h index 6fedc9f2d..3a334c033 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.h +++ b/libcef/browser/alloy/alloy_content_browser_client.h @@ -9,11 +9,10 @@ #include #include -#include "include/cef_request_context_handler.h" -#include "libcef/browser/request_context_impl.h" - #include "base/memory/ref_counted.h" #include "build/build_config.h" +#include "cef/include/cef_request_context_handler.h" +#include "cef/libcef/browser/request_context_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/web_contents.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/libcef/browser/alloy/alloy_download_manager_delegate.cc b/libcef/browser/alloy/alloy_download_manager_delegate.cc index 8c80e5165..5952c9a36 100644 --- a/libcef/browser/alloy/alloy_download_manager_delegate.cc +++ b/libcef/browser/alloy/alloy_download_manager_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_download_manager_delegate.h" +#include "cef/libcef/browser/alloy/alloy_download_manager_delegate.h" #include "chrome/common/chrome_constants.h" #include "components/download/public/common/download_item.h" diff --git a/libcef/browser/alloy/alloy_download_manager_delegate.h b/libcef/browser/alloy/alloy_download_manager_delegate.h index 5dfe0a75c..c447f2eae 100644 --- a/libcef/browser/alloy/alloy_download_manager_delegate.h +++ b/libcef/browser/alloy/alloy_download_manager_delegate.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_DOWNLOAD_MANAGER_DELEGATE_H_ #pragma once -#include "libcef/browser/download_manager_delegate_impl.h" +#include "cef/libcef/browser/download_manager_delegate_impl.h" // Specialization for the Alloy bootstrap. class AlloyDownloadManagerDelegate : public CefDownloadManagerDelegateImpl { diff --git a/libcef/browser/alloy/alloy_download_util.cc b/libcef/browser/alloy/alloy_download_util.cc index a3409e695..bf79937a2 100644 --- a/libcef/browser/alloy/alloy_download_util.cc +++ b/libcef/browser/alloy/alloy_download_util.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/alloy/alloy_download_util.h" +#include "cef/libcef/browser/alloy/alloy_download_util.h" -#include "libcef/browser/alloy/alloy_browser_context.h" +#include "cef/libcef/browser/alloy/alloy_browser_context.h" namespace alloy { diff --git a/libcef/browser/alloy/alloy_web_contents_view_delegate.cc b/libcef/browser/alloy/alloy_web_contents_view_delegate.cc index 39a65dc56..9c065abfe 100644 --- a/libcef/browser/alloy/alloy_web_contents_view_delegate.cc +++ b/libcef/browser/alloy/alloy_web_contents_view_delegate.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/alloy_web_contents_view_delegate.h" +#include "cef/libcef/browser/alloy/alloy_web_contents_view_delegate.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include "content/public/browser/web_contents.h" -#include "libcef/browser/alloy/alloy_browser_host_impl.h" - AlloyWebContentsViewDelegate::AlloyWebContentsViewDelegate( content::WebContents* web_contents) : web_contents_(web_contents) {} diff --git a/libcef/browser/alloy/alloy_web_contents_view_delegate.h b/libcef/browser/alloy/alloy_web_contents_view_delegate.h index 17992dfec..59fa22ff8 100644 --- a/libcef/browser/alloy/alloy_web_contents_view_delegate.h +++ b/libcef/browser/alloy/alloy_web_contents_view_delegate.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_ALLOY_ALLOY_WEB_CONTENTS_VIEW_DELEGATE_H_ #pragma once -#include "include/internal/cef_ptr.h" - +#include "cef/include/internal/cef_ptr.h" #include "content/public/browser/web_contents_view_delegate.h" namespace content { diff --git a/libcef/browser/alloy/browser_platform_delegate_alloy.cc b/libcef/browser/alloy/browser_platform_delegate_alloy.cc index 18a0b50d9..66cfff482 100644 --- a/libcef/browser/alloy/browser_platform_delegate_alloy.cc +++ b/libcef/browser/alloy/browser_platform_delegate_alloy.cc @@ -2,19 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/extensions/extension_background_host.h" -#include "libcef/browser/extensions/extension_system.h" -#include "libcef/browser/extensions/extension_view_host.h" -#include "libcef/browser/extensions/extension_web_contents_observer.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/net/url_util.h" - #include "base/logging.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/extensions/extension_background_host.h" +#include "cef/libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/extensions/extension_view_host.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/net/url_util.h" #include "cef/libcef/features/features.h" #include "chrome/browser/task_manager/web_contents_tags.h" #include "chrome/browser/ui/tab_helpers.h" @@ -28,9 +27,8 @@ #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h" -#include "libcef/features/runtime_checks.h" - +#include "cef/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h" +#include "cef/libcef/features/runtime_checks.h" #include "chrome/browser/printing/printing_init.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "components/javascript_dialogs/tab_modal_dialog_manager.h" diff --git a/libcef/browser/alloy/browser_platform_delegate_alloy.h b/libcef/browser/alloy/browser_platform_delegate_alloy.h index 8bb9704b2..547ef5f20 100644 --- a/libcef/browser/alloy/browser_platform_delegate_alloy.h +++ b/libcef/browser/alloy/browser_platform_delegate_alloy.h @@ -6,10 +6,9 @@ #ifndef CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_ #define CEF_LIBCEF_BROWSER_ALLOY_BROWSER_PLATFORM_DELEGATE_ALLOY_H_ -#include "libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h" -#include "libcef/browser/browser_platform_delegate.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h" +#include "cef/libcef/browser/browser_platform_delegate.h" #include "components/find_in_page/find_notification_details.h" #include "content/public/browser/web_contents.h" #include "ui/gfx/geometry/size.h" diff --git a/libcef/browser/alloy/chrome_browser_process_alloy.cc b/libcef/browser/alloy/chrome_browser_process_alloy.cc index 51d031c07..00981ee39 100644 --- a/libcef/browser/alloy/chrome_browser_process_alloy.cc +++ b/libcef/browser/alloy/chrome_browser_process_alloy.cc @@ -3,22 +3,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/chrome_browser_process_alloy.h" +#include "cef/libcef/browser/alloy/chrome_browser_process_alloy.h" #include -#include "libcef/browser/alloy/chrome_profile_manager_alloy.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/context.h" -#include "libcef/browser/extensions/extensions_browser_client.h" -#include "libcef/browser/prefs/browser_prefs.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_client.h" -#include "libcef/common/extensions/extensions_util.h" - #include "base/command_line.h" #include "base/path_service.h" +#include "cef/libcef/browser/alloy/chrome_profile_manager_alloy.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/extensions/extensions_browser_client.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_client.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/component_updater/chrome_component_updater_configurator.h" #include "chrome/browser/net/system_network_context_manager.h" diff --git a/libcef/browser/alloy/chrome_profile_alloy.cc b/libcef/browser/alloy/chrome_profile_alloy.cc index 0886505d2..00d3b385f 100644 --- a/libcef/browser/alloy/chrome_profile_alloy.cc +++ b/libcef/browser/alloy/chrome_profile_alloy.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/chrome_profile_alloy.h" +#include "cef/libcef/browser/alloy/chrome_profile_alloy.h" #include "base/no_destructor.h" #include "components/profile_metrics/browser_profile_type.h" diff --git a/libcef/browser/alloy/chrome_profile_manager_alloy.cc b/libcef/browser/alloy/chrome_profile_manager_alloy.cc index 7225c8260..1a8266a07 100644 --- a/libcef/browser/alloy/chrome_profile_manager_alloy.cc +++ b/libcef/browser/alloy/chrome_profile_manager_alloy.cc @@ -3,11 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/chrome_profile_manager_alloy.h" +#include "cef/libcef/browser/alloy/chrome_profile_manager_alloy.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/common/app_manager.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/common/app_manager.h" namespace { diff --git a/libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc b/libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc index c9c2efc47..3ca11385a 100644 --- a/libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc +++ b/libcef/browser/alloy/devtools/alloy_devtools_window_runner.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/devtools/alloy_devtools_window_runner.h" +#include "cef/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h" -#include "libcef/browser/alloy/devtools/devtools_frontend.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/alloy/devtools/devtools_frontend.h" +#include "cef/libcef/browser/thread_util.h" void AlloyDevToolsWindowRunner::ShowDevTools( CefBrowserHostBase* opener, diff --git a/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h b/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h index c879da715..cc46010db 100644 --- a/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h +++ b/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_ALLOY_DEVTOOLS_ALLOY_DEVTOOLS_WINDOW_RUNNER_H_ #pragma once -#include "libcef/browser/devtools/devtools_window_runner.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/devtools/devtools_window_runner.h" class CefDevToolsFrontend; diff --git a/libcef/browser/alloy/devtools/devtools_file_manager.cc b/libcef/browser/alloy/devtools/devtools_file_manager.cc index a7e3150e5..c07ee425e 100644 --- a/libcef/browser/alloy/devtools/devtools_file_manager.cc +++ b/libcef/browser/alloy/devtools/devtools_file_manager.cc @@ -2,9 +2,7 @@ // 2013 The Chromium 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 "libcef/browser/alloy/devtools/devtools_file_manager.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/alloy/devtools/devtools_file_manager.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -19,6 +17,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include "chrome/common/pref_names.h" #include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/web_contents.h" diff --git a/libcef/browser/alloy/devtools/devtools_file_manager.h b/libcef/browser/alloy/devtools/devtools_file_manager.h index 186c76717..c1c893e88 100644 --- a/libcef/browser/alloy/devtools/devtools_file_manager.h +++ b/libcef/browser/alloy/devtools/devtools_file_manager.h @@ -5,12 +5,12 @@ #ifndef CEF_LIBCEF_BROWSER_ALLOY_DEVTOOLS_DEVTOOLS_FILE_MANAGER_H_ #define CEF_LIBCEF_BROWSER_ALLOY_DEVTOOLS_DEVTOOLS_FILE_MANAGER_H_ -#include "base/functional/callback_forward.h" -#include "base/memory/weak_ptr.h" - #include #include +#include "base/functional/callback_forward.h" +#include "base/memory/weak_ptr.h" + namespace base { class FilePath; class SequencedTaskRunner; diff --git a/libcef/browser/alloy/devtools/devtools_frontend.cc b/libcef/browser/alloy/devtools/devtools_frontend.cc index 38a52b627..7c9a9549c 100644 --- a/libcef/browser/alloy/devtools/devtools_frontend.cc +++ b/libcef/browser/alloy/devtools/devtools_frontend.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/devtools/devtools_frontend.h" +#include "cef/libcef/browser/alloy/devtools/devtools_frontend.h" #include @@ -10,14 +10,6 @@ #include #include -#include "libcef/browser/alloy/devtools/devtools_manager_delegate.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/net/devtools_scheme_handler.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/task_runner_manager.h" -#include "libcef/features/runtime_checks.h" - #include "base/base64.h" #include "base/command_line.h" #include "base/files/file_util.h" @@ -31,6 +23,13 @@ #include "base/strings/utf_string_conversions.h" #include "base/uuid.h" #include "base/values.h" +#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/net/devtools_scheme_handler.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/task_runner_manager.h" +#include "cef/libcef/features/runtime_checks.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/prefs/scoped_user_pref_update.h" diff --git a/libcef/browser/alloy/devtools/devtools_frontend.h b/libcef/browser/alloy/devtools/devtools_frontend.h index 45f88459e..ee708c502 100644 --- a/libcef/browser/alloy/devtools/devtools_frontend.h +++ b/libcef/browser/alloy/devtools/devtools_frontend.h @@ -7,13 +7,12 @@ #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/alloy/devtools/devtools_file_manager.h" - #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/values.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/alloy/devtools/devtools_file_manager.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/web_contents_observer.h" diff --git a/libcef/browser/alloy/devtools/devtools_manager_delegate.cc b/libcef/browser/alloy/devtools/devtools_manager_delegate.cc index 44f922a05..126053d1e 100644 --- a/libcef/browser/alloy/devtools/devtools_manager_delegate.cc +++ b/libcef/browser/alloy/devtools/devtools_manager_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/devtools/devtools_manager_delegate.h" +#include "cef/libcef/browser/alloy/devtools/devtools_manager_delegate.h" #include diff --git a/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc b/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc index e24d11b5a..dd57f2d4b 100644 --- a/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc +++ b/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc @@ -3,11 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" - -#include "libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" #include "base/notreached.h" +#include "cef/libcef/browser/browser_host_base.h" #include "components/web_modal/web_contents_modal_dialog_host.h" namespace { diff --git a/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc b/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc index bb7647bb2..a719fc5cb 100644 --- a/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc +++ b/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc @@ -3,11 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h" - -#include "libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h" #include "base/logging.h" +#include "cef/libcef/browser/browser_host_base.h" namespace { diff --git a/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h b/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h index 4d3df0da1..85bb3b925 100644 --- a/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h +++ b/libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.h @@ -15,4 +15,4 @@ std::unique_ptr CreateAlloyJavaScriptTabModalDialogManagerDelegateDesktop( content::WebContents* web_contents); -#endif // CEF_LIBCEF_BROWSER_ALLOY_DIALOGS_ALLOY_JAVASCRIPT_DIALOG_MANAGER_DELEGATE_H_ \ No newline at end of file +#endif // CEF_LIBCEF_BROWSER_ALLOY_DIALOGS_ALLOY_JAVASCRIPT_DIALOG_MANAGER_DELEGATE_H_ diff --git a/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.cc b/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.cc index 872fcafe7..fd85cf439 100644 --- a/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.cc +++ b/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h" - -#include "libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_web_contents_dialog_helper.h" #include "base/notreached.h" +#include "cef/libcef/browser/browser_platform_delegate.h" #include "chrome/browser/platform_util.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "ui/views/widget/widget.h" diff --git a/libcef/browser/audio_capturer.cc b/libcef/browser/audio_capturer.cc index c569b3621..ee86e9910 100644 --- a/libcef/browser/audio_capturer.cc +++ b/libcef/browser/audio_capturer.cc @@ -3,11 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/audio_capturer.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/audio_loopback_stream_creator.h" +#include "cef/libcef/browser/audio_capturer.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/audio_loopback_stream_creator.h" #include "components/mirroring/service/captured_audio_input.h" #include "media/audio/audio_input_device.h" diff --git a/libcef/browser/audio_capturer.h b/libcef/browser/audio_capturer.h index cdd2911a8..13e025189 100644 --- a/libcef/browser/audio_capturer.h +++ b/libcef/browser/audio_capturer.h @@ -7,9 +7,8 @@ #define CEF_LIBCEF_BROWSER_AUDIO_CAPTURER_H_ #pragma once -#include "include/internal/cef_ptr.h" -#include "include/internal/cef_types_wrappers.h" - +#include "cef/include/internal/cef_ptr.h" +#include "cef/include/internal/cef_types_wrappers.h" #include "media/base/audio_capturer_source.h" namespace media { diff --git a/libcef/browser/audio_loopback_stream_creator.cc b/libcef/browser/audio_loopback_stream_creator.cc index 3668d690b..f5d48771f 100644 --- a/libcef/browser/audio_loopback_stream_creator.cc +++ b/libcef/browser/audio_loopback_stream_creator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/audio_loopback_stream_creator.h" +#include "cef/libcef/browser/audio_loopback_stream_creator.h" #include #include diff --git a/libcef/browser/browser_contents_delegate.cc b/libcef/browser/browser_contents_delegate.cc index a895225c3..f92e4ed43 100644 --- a/libcef/browser/browser_contents_delegate.cc +++ b/libcef/browser/browser_contents_delegate.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_contents_delegate.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/browser_util.h" -#include "libcef/browser/native/cursor_util.h" -#include "libcef/common/frame_util.h" +#include "cef/libcef/browser/browser_contents_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/browser_util.h" +#include "cef/libcef/browser/native/cursor_util.h" +#include "cef/libcef/common/frame_util.h" #include "chrome/browser/ui/views/sad_tab_view.h" #include "chrome/common/chrome_result_codes.h" #include "content/browser/renderer_host/render_widget_host_impl.h" diff --git a/libcef/browser/browser_contents_delegate.h b/libcef/browser/browser_contents_delegate.h index 2b83a0ee7..0477188ee 100644 --- a/libcef/browser/browser_contents_delegate.h +++ b/libcef/browser/browser_contents_delegate.h @@ -8,10 +8,9 @@ #include -#include "libcef/browser/frame_host_impl.h" - #include "base/callback_list.h" #include "base/observer_list.h" +#include "cef/libcef/browser/frame_host_impl.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" diff --git a/libcef/browser/browser_context.cc b/libcef/browser/browser_context.cc index b99cd08df..10e86dec4 100644 --- a/libcef/browser/browser_context.cc +++ b/libcef/browser/browser_context.cc @@ -2,25 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_context.h" +#include "cef/libcef/browser/browser_context.h" #include #include #include -#include "libcef/browser/context.h" -#include "libcef/browser/media_router/media_router_manager.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/frame_util.h" - #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/media_router/media_router_manager.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/frame_util.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" diff --git a/libcef/browser/browser_context.h b/libcef/browser/browser_context.h index 34350b55f..29ebcc301 100644 --- a/libcef/browser/browser_context.h +++ b/libcef/browser/browser_context.h @@ -10,14 +10,13 @@ #include #include -#include "include/cef_request_context_handler.h" -#include "libcef/browser/iothread_state.h" -#include "libcef/browser/request_context_handler_map.h" - #include "base/files/file_path.h" #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner_helpers.h" +#include "cef/include/cef_request_context_handler.h" +#include "cef/libcef/browser/iothread_state.h" +#include "cef/libcef/browser/request_context_handler_map.h" #include "cef/libcef/features/features.h" #include "chrome/common/plugin.mojom.h" #include "services/network/public/mojom/network_context.mojom.h" diff --git a/libcef/browser/browser_context_keyed_service_factories.cc b/libcef/browser/browser_context_keyed_service_factories.cc index 4624fc3a7..0cbc317f9 100644 --- a/libcef/browser/browser_context_keyed_service_factories.cc +++ b/libcef/browser/browser_context_keyed_service_factories.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/browser_context_keyed_service_factories.h" -#include "libcef/common/extensions/extensions_util.h" +#include "cef/libcef/browser/browser_context_keyed_service_factories.h" #include "base/feature_list.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/first_party_sets/first_party_sets_policy_service_factory.h" #include "chrome/browser/media/router/chrome_media_router_factory.h" diff --git a/libcef/browser/browser_frame.cc b/libcef/browser/browser_frame.cc index caf739a1b..aacc292f0 100644 --- a/libcef/browser/browser_frame.cc +++ b/libcef/browser/browser_frame.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_frame.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/frame_util.h" +#include "cef/libcef/browser/browser_frame.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/frame_util.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" diff --git a/libcef/browser/browser_frame.h b/libcef/browser/browser_frame.h index 0ac6826a9..a21d762b8 100644 --- a/libcef/browser/browser_frame.h +++ b/libcef/browser/browser_frame.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_BROWSER_FRAME_H_ #pragma once -#include "libcef/browser/frame_host_impl.h" -#include "libcef/browser/frame_service_base.h" - +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/browser/frame_service_base.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "mojo/public/cpp/bindings/binder_map.h" diff --git a/libcef/browser/browser_host_base.cc b/libcef/browser/browser_host_base.cc index d2898988b..a3a28145b 100644 --- a/libcef/browser/browser_host_base.cc +++ b/libcef/browser/browser_host_base.cc @@ -2,23 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_host_base.h" #include -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/context.h" -#include "libcef/browser/extensions/browser_extensions_util.h" -#include "libcef/browser/hang_monitor.h" -#include "libcef/browser/image_impl.h" -#include "libcef/browser/navigation_entry_impl.h" -#include "libcef/browser/printing/print_util.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/net/url_util.h" - #include "base/logging.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/hang_monitor.h" +#include "cef/libcef/browser/image_impl.h" +#include "cef/libcef/browser/navigation_entry_impl.h" +#include "cef/libcef/browser/printing/print_util.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/net/url_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_service.h" diff --git a/libcef/browser/browser_host_base.h b/libcef/browser/browser_host_base.h index 62e4370e7..14bd46991 100644 --- a/libcef/browser/browser_host_base.h +++ b/libcef/browser/browser_host_base.h @@ -6,22 +6,21 @@ #define CEF_LIBCEF_BROWSER_BROWSER_HOST_BASE_H_ #pragma once -#include "include/cef_browser.h" -#include "include/cef_client.h" -#include "include/cef_unresponsive_process_callback.h" -#include "include/views/cef_browser_view.h" -#include "libcef/browser/browser_contents_delegate.h" -#include "libcef/browser/browser_info.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/devtools/devtools_protocol_manager.h" -#include "libcef/browser/devtools/devtools_window_runner.h" -#include "libcef/browser/file_dialog_manager.h" -#include "libcef/browser/frame_host_impl.h" -#include "libcef/browser/media_stream_registrar.h" -#include "libcef/browser/request_context_impl.h" - #include "base/observer_list.h" #include "base/synchronization/lock.h" +#include "cef/include/cef_browser.h" +#include "cef/include/cef_client.h" +#include "cef/include/cef_unresponsive_process_callback.h" +#include "cef/include/views/cef_browser_view.h" +#include "cef/libcef/browser/browser_contents_delegate.h" +#include "cef/libcef/browser/browser_info.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/devtools/devtools_protocol_manager.h" +#include "cef/libcef/browser/devtools/devtools_window_runner.h" +#include "cef/libcef/browser/file_dialog_manager.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/browser/media_stream_registrar.h" +#include "cef/libcef/browser/request_context_impl.h" #include "cef/libcef/features/features.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) diff --git a/libcef/browser/browser_host_create.cc b/libcef/browser/browser_host_create.cc index 9db3fa3ee..fb322108b 100644 --- a/libcef/browser/browser_host_create.cc +++ b/libcef/browser/browser_host_create.cc @@ -3,13 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "include/cef_browser.h" -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/chrome/chrome_browser_host_impl.h" -#include "libcef/browser/chrome/views/chrome_child_window.h" -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" -#include "libcef/features/runtime.h" +#include "cef/include/cef_browser.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/chrome/chrome_browser_host_impl.h" +#include "cef/libcef/browser/chrome/views/chrome_child_window.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/features/runtime.h" namespace { diff --git a/libcef/browser/browser_info.cc b/libcef/browser/browser_info.cc index ea2ca4f8e..a4d1efe51 100644 --- a/libcef/browser/browser_info.cc +++ b/libcef/browser/browser_info.cc @@ -2,17 +2,16 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/browser_info.h" +#include "cef/libcef/browser/browser_info.h" #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/values_impl.h" - #include "base/logging.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/values_impl.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/render_process_host.h" diff --git a/libcef/browser/browser_info.h b/libcef/browser/browser_info.h index 0383812f1..ed8e40747 100644 --- a/libcef/browser/browser_info.h +++ b/libcef/browser/browser_info.h @@ -10,15 +10,14 @@ #include #include -#include "include/internal/cef_ptr.h" -#include "libcef/common/values_impl.h" - #include "base/containers/unique_ptr_adapters.h" #include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "cef/include/internal/cef_ptr.h" +#include "cef/libcef/common/values_impl.h" #include "content/public/browser/global_routing_id.h" #include "content/public/browser/render_frame_host.h" diff --git a/libcef/browser/browser_info_manager.cc b/libcef/browser/browser_info_manager.cc index 9d4fb07e4..8bf2bb7a7 100644 --- a/libcef/browser/browser_info_manager.cc +++ b/libcef/browser/browser_info_manager.cc @@ -2,23 +2,22 @@ // Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_info_manager.h" #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/extensions/browser_extensions_util.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/values_impl.h" -#include "libcef/features/runtime.h" - #include "base/command_line.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/values_impl.h" +#include "cef/libcef/features/runtime.h" #include "content/public/browser/child_process_host.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" diff --git a/libcef/browser/browser_info_manager.h b/libcef/browser/browser_info_manager.h index 9b4d4a8c9..f85ec1760 100644 --- a/libcef/browser/browser_info_manager.h +++ b/libcef/browser/browser_info_manager.h @@ -6,17 +6,15 @@ #define CEF_LIBCEF_BROWSER_BROWSER_INFO_MANAGER_H_ #pragma once -#include "include/cef_client.h" - #include #include #include #include -#include "libcef/browser/browser_info.h" - #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" +#include "cef/include/cef_client.h" +#include "cef/libcef/browser/browser_info.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "content/public/browser/global_routing_id.h" #include "content/public/browser/render_process_host_observer.h" diff --git a/libcef/browser/browser_manager.cc b/libcef/browser/browser_manager.cc index 76afc4ea6..45e7f270b 100644 --- a/libcef/browser/browser_manager.cc +++ b/libcef/browser/browser_manager.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_manager.h" - -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/origin_whitelist_impl.h" -#include "libcef/common/frame_util.h" +#include "cef/libcef/browser/browser_manager.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/origin_whitelist_impl.h" +#include "cef/libcef/common/frame_util.h" #include "content/public/browser/render_process_host.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" diff --git a/libcef/browser/browser_message_loop.cc b/libcef/browser/browser_message_loop.cc index 31d4b4a12..77c5eda25 100644 --- a/libcef/browser/browser_message_loop.cc +++ b/libcef/browser/browser_message_loop.cc @@ -2,12 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/browser_message_loop.h" -#include "libcef/common/app_manager.h" +#include "cef/libcef/browser/browser_message_loop.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump.h" #include "base/message_loop/message_pump_for_ui.h" +#include "cef/libcef/common/app_manager.h" #if BUILDFLAG(IS_MAC) #include "base/apple/scoped_nsautorelease_pool.h" diff --git a/libcef/browser/browser_platform_delegate.cc b/libcef/browser/browser_platform_delegate.cc index 684e22428..13262bd0b 100644 --- a/libcef/browser/browser_platform_delegate.cc +++ b/libcef/browser/browser_platform_delegate.cc @@ -2,17 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_platform_delegate.h" - -#include "include/views/cef_window.h" -#include "include/views/cef_window_delegate.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/common/cef_switches.h" +#include "cef/libcef/browser/browser_platform_delegate.h" #include "base/command_line.h" #include "base/logging.h" +#include "cef/include/views/cef_window.h" +#include "cef/include/views/cef_window_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/common/cef_switches.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" diff --git a/libcef/browser/browser_platform_delegate.h b/libcef/browser/browser_platform_delegate.h index fb3b42745..c1ac04d32 100644 --- a/libcef/browser/browser_platform_delegate.h +++ b/libcef/browser/browser_platform_delegate.h @@ -9,12 +9,11 @@ #include #include -#include "include/cef_client.h" -#include "include/cef_drag_data.h" -#include "include/internal/cef_types.h" -#include "include/views/cef_browser_view.h" - #include "base/functional/callback_forward.h" +#include "cef/include/cef_client.h" +#include "cef/include/cef_drag_data.h" +#include "cef/include/internal/cef_types.h" +#include "cef/include/views/cef_browser_view.h" #include "cef/libcef/features/features.h" #include "third_party/blink/public/common/page/drag_operation.h" #include "third_party/blink/public/mojom/drag/drag.mojom-forward.h" diff --git a/libcef/browser/browser_platform_delegate_create.cc b/libcef/browser/browser_platform_delegate_create.cc index 3edb4cf28..20a13d9b6 100644 --- a/libcef/browser/browser_platform_delegate_create.cc +++ b/libcef/browser/browser_platform_delegate_create.cc @@ -2,37 +2,34 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/browser_platform_delegate.h" - #include -#include "libcef/browser/context.h" - #include "base/memory/ptr_util.h" #include "build/build_config.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/chrome/browser_platform_delegate_chrome.h" -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h" -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" -#include "libcef/browser/chrome/views/chrome_child_window.h" -#include "libcef/browser/views/browser_platform_delegate_views.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/chrome/browser_platform_delegate_chrome.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" +#include "cef/libcef/browser/chrome/views/chrome_child_window.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/views/browser_platform_delegate_views.h" #if BUILDFLAG(IS_WIN) -#include "libcef/browser/native/browser_platform_delegate_native_win.h" -#include "libcef/browser/osr/browser_platform_delegate_osr_win.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_win.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_win.h" #elif BUILDFLAG(IS_MAC) -#include "libcef/browser/native/browser_platform_delegate_native_mac.h" -#include "libcef/browser/osr/browser_platform_delegate_osr_mac.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_mac.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_mac.h" #elif BUILDFLAG(IS_LINUX) -#include "libcef/browser/native/browser_platform_delegate_native_linux.h" -#include "libcef/browser/osr/browser_platform_delegate_osr_linux.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_linux.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_linux.h" #else #error A delegate implementation is not available for your platform. #endif #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/extensions/browser_platform_delegate_background.h" +#include "cef/libcef/browser/extensions/browser_platform_delegate_background.h" #endif namespace { diff --git a/libcef/browser/browser_util.cc b/libcef/browser/browser_util.cc index adad37016..4cd052389 100644 --- a/libcef/browser/browser_util.cc +++ b/libcef/browser/browser_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/browser_util.h" +#include "cef/libcef/browser/browser_util.h" #include "content/public/common/input/native_web_keyboard_event.h" diff --git a/libcef/browser/browser_util.h b/libcef/browser/browser_util.h index 74c36f146..f0a2c0944 100644 --- a/libcef/browser/browser_util.h +++ b/libcef/browser/browser_util.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_BROWSER_UTIL_H_ #pragma once -#include "include/internal/cef_types_wrappers.h" +#include "cef/include/internal/cef_types_wrappers.h" namespace content { struct NativeWebKeyboardEvent; diff --git a/libcef/browser/certificate_query.cc b/libcef/browser/certificate_query.cc index e5af82c49..27ed90b67 100644 --- a/libcef/browser/certificate_query.cc +++ b/libcef/browser/certificate_query.cc @@ -2,16 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/certificate_query.h" - -#include "include/cef_request_handler.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/ssl_info_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/certificate_query.h" #include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/logging.h" +#include "cef/include/cef_request_handler.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/ssl_info_impl.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/web_contents.h" #include "net/ssl/ssl_info.h" #include "url/gurl.h" diff --git a/libcef/browser/chrome/browser_platform_delegate_chrome.cc b/libcef/browser/chrome/browser_platform_delegate_chrome.cc index 5c4ac3604..66c147a5e 100644 --- a/libcef/browser/chrome/browser_platform_delegate_chrome.cc +++ b/libcef/browser/chrome/browser_platform_delegate_chrome.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/browser_platform_delegate_chrome.h" - -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/chrome/browser_platform_delegate_chrome.h" +#include "cef/libcef/browser/views/view_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/libcef/browser/chrome/browser_platform_delegate_chrome.h b/libcef/browser/chrome/browser_platform_delegate_chrome.h index f452ca33b..8fc77a38b 100644 --- a/libcef/browser/chrome/browser_platform_delegate_chrome.h +++ b/libcef/browser/chrome/browser_platform_delegate_chrome.h @@ -5,8 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_CHROME_BROWSER_PLATFORM_DELEGATE_CHROME_H_ #define CEF_LIBCEF_BROWSER_CHROME_BROWSER_PLATFORM_DELEGATE_CHROME_H_ -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" class Browser; diff --git a/libcef/browser/chrome/chrome_browser_context.cc b/libcef/browser/chrome/chrome_browser_context.cc index 6d37ed353..2cc97f62e 100644 --- a/libcef/browser/chrome/chrome_browser_context.cc +++ b/libcef/browser/chrome/chrome_browser_context.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_browser_context.h" +#include "cef/libcef/browser/chrome/chrome_browser_context.h" #include -#include "libcef/browser/prefs/browser_prefs.h" -#include "libcef/browser/thread_util.h" - #include "base/threading/thread_restrictions.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/libcef/browser/chrome/chrome_browser_context.h b/libcef/browser/chrome/chrome_browser_context.h index 0e6b4220a..d7ca38ed2 100644 --- a/libcef/browser/chrome/chrome_browser_context.h +++ b/libcef/browser/chrome/chrome_browser_context.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_CHROME_CHROME_BROWSER_CONTEXT_H_ #pragma once -#include "libcef/browser/browser_context.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/browser_context.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_observer.h" diff --git a/libcef/browser/chrome/chrome_browser_delegate.cc b/libcef/browser/chrome/chrome_browser_delegate.cc index f97c0d4f6..d315766c9 100644 --- a/libcef/browser/chrome/chrome_browser_delegate.cc +++ b/libcef/browser/chrome/chrome_browser_delegate.cc @@ -2,28 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_browser_delegate.h" +#include "cef/libcef/browser/chrome/chrome_browser_delegate.h" #include -#include "libcef/browser/browser_contents_delegate.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/chrome/chrome_browser_context.h" -#include "libcef/browser/chrome/chrome_browser_host_impl.h" -#include "libcef/browser/chrome/chrome_devtools_window_runner.h" -#include "libcef/browser/chrome/views/chrome_browser_view.h" -#include "libcef/browser/chrome/views/chrome_child_window.h" -#include "libcef/browser/hang_monitor.h" -#include "libcef/browser/media_access_query.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/browser/views/window_impl.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/frame_util.h" -#include "third_party/blink/public/mojom/page/draggable_region.mojom.h" - +#include "cef/libcef/browser/browser_contents_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/chrome/chrome_browser_context.h" +#include "cef/libcef/browser/chrome/chrome_browser_host_impl.h" +#include "cef/libcef/browser/chrome/chrome_devtools_window_runner.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_view.h" +#include "cef/libcef/browser/chrome/views/chrome_child_window.h" +#include "cef/libcef/browser/hang_monitor.h" +#include "cef/libcef/browser/media_access_query.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/window_impl.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/frame_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" @@ -33,6 +31,7 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/input/native_web_keyboard_event.h" +#include "third_party/blink/public/mojom/page/draggable_region.mojom.h" using content::KeyboardEventProcessingResult; diff --git a/libcef/browser/chrome/chrome_browser_delegate.h b/libcef/browser/chrome/chrome_browser_delegate.h index f092f09d9..20a740e4f 100644 --- a/libcef/browser/chrome/chrome_browser_delegate.h +++ b/libcef/browser/chrome/chrome_browser_delegate.h @@ -9,9 +9,9 @@ #include #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info.h" -#include "libcef/browser/chrome/browser_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info.h" +#include "cef/libcef/browser/chrome/browser_delegate.h" class CefBrowserContentsDelegate; class CefRequestContextImpl; diff --git a/libcef/browser/chrome/chrome_browser_host_impl.cc b/libcef/browser/chrome/chrome_browser_host_impl.cc index f0c875f7f..426e28416 100644 --- a/libcef/browser/chrome/chrome_browser_host_impl.cc +++ b/libcef/browser/chrome/chrome_browser_host_impl.cc @@ -2,17 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_browser_host_impl.h" - -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/chrome/browser_platform_delegate_chrome.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/common/net/url_util.h" -#include "libcef/features/runtime_checks.h" +#include "cef/libcef/browser/chrome/chrome_browser_host_impl.h" #include "base/logging.h" #include "base/notreached.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/chrome/browser_platform_delegate_chrome.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_frame.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_view.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/common/net/url_util.h" +#include "cef/libcef/features/runtime_checks.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_navigator.h" @@ -21,8 +22,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/frame/contents_web_view.h" #include "chrome/common/pref_names.h" -#include "libcef/browser/chrome/views/chrome_browser_frame.h" -#include "libcef/browser/chrome/views/chrome_browser_view.h" // static CefRefPtr ChromeBrowserHostImpl::Create( diff --git a/libcef/browser/chrome/chrome_browser_host_impl.h b/libcef/browser/chrome/chrome_browser_host_impl.h index 0bc329e63..add17dffe 100644 --- a/libcef/browser/chrome/chrome_browser_host_impl.h +++ b/libcef/browser/chrome/chrome_browser_host_impl.h @@ -8,10 +8,9 @@ #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/chrome/browser_delegate.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/chrome/browser_delegate.h" #include "chrome/browser/ui/browser.h" class ChromeBrowserDelegate; diff --git a/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc b/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc index a479ec577..5110df638 100644 --- a/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc +++ b/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.cc @@ -2,17 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h" - -#include "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" -#include "libcef/browser/chrome/chrome_context_menu_handler.h" -#include "libcef/browser/chrome/chrome_startup_browser_creator.h" -#include "libcef/browser/context.h" -#include "libcef/browser/file_dialog_runner.h" -#include "libcef/browser/net/chrome_scheme_handler.h" -#include "libcef/browser/permission_prompt.h" +#include "cef/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h" #include "base/task/thread_pool.h" +#include "cef/libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h" +#include "cef/libcef/browser/chrome/chrome_context_menu_handler.h" +#include "cef/libcef/browser/chrome/chrome_startup_browser_creator.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/file_dialog_runner.h" +#include "cef/libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/permission_prompt.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" #include "components/constrained_window/constrained_window_views.h" diff --git a/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h b/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h index 6d7bf1aec..46be52169 100644 --- a/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h +++ b/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h @@ -7,9 +7,8 @@ #include -#include "libcef/browser/request_context_impl.h" - #include "base/task/single_thread_task_runner.h" +#include "cef/libcef/browser/request_context_impl.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" // Wrapper that owns and initialize the browser memory-related extra parts. diff --git a/libcef/browser/chrome/chrome_content_browser_client_cef.cc b/libcef/browser/chrome/chrome_content_browser_client_cef.cc index 6710b2c04..e348d081c 100644 --- a/libcef/browser/chrome/chrome_content_browser_client_cef.cc +++ b/libcef/browser/chrome/chrome_content_browser_client_cef.cc @@ -3,31 +3,30 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_content_browser_client_cef.h" +#include "cef/libcef/browser/chrome/chrome_content_browser_client_cef.h" #include -#include "libcef/browser/browser_frame.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/browser_manager.h" -#include "libcef/browser/certificate_query.h" -#include "libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h" -#include "libcef/browser/context.h" -#include "libcef/browser/net/chrome_scheme_handler.h" -#include "libcef/browser/net/throttle_handler.h" -#include "libcef/browser/net_service/cookie_manager_impl.h" -#include "libcef/browser/net_service/login_delegate.h" -#include "libcef/browser/net_service/proxy_url_loader_factory.h" -#include "libcef/browser/net_service/resource_request_handler_wrapper.h" -#include "libcef/browser/prefs/browser_prefs.h" -#include "libcef/browser/prefs/renderer_prefs.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/command_line_impl.h" - #include "base/command_line.h" #include "base/path_service.h" +#include "cef/libcef/browser/browser_frame.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/browser_manager.h" +#include "cef/libcef/browser/certificate_query.h" +#include "cef/libcef/browser/chrome/chrome_browser_main_extra_parts_cef.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/net/throttle_handler.h" +#include "cef/libcef/browser/net_service/cookie_manager_impl.h" +#include "cef/libcef/browser/net_service/login_delegate.h" +#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h" +#include "cef/libcef/browser/net_service/resource_request_handler_wrapper.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/prefs/renderer_prefs.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/command_line_impl.h" #include "cef/libcef/features/features.h" #include "chrome/browser/chrome_browser_main.h" #include "chrome/browser/net/system_network_context_manager.h" @@ -46,7 +45,7 @@ #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h" #if !BUILDFLAG(IS_MAC) -#include "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" +#include "cef/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" #endif namespace { diff --git a/libcef/browser/chrome/chrome_content_browser_client_cef.h b/libcef/browser/chrome/chrome_content_browser_client_cef.h index 1ef61c2be..9f8696ff3 100644 --- a/libcef/browser/chrome/chrome_content_browser_client_cef.h +++ b/libcef/browser/chrome/chrome_content_browser_client_cef.h @@ -8,8 +8,7 @@ #include -#include "libcef/browser/request_context_impl.h" - +#include "cef/libcef/browser/request_context_impl.h" #include "chrome/browser/chrome_content_browser_client.h" #include "content/public/browser/web_contents_view_delegate.h" diff --git a/libcef/browser/chrome/chrome_content_browser_client_cef_mac.mm b/libcef/browser/chrome/chrome_content_browser_client_cef_mac.mm index 2d604883f..e840a8ab0 100644 --- a/libcef/browser/chrome/chrome_content_browser_client_cef_mac.mm +++ b/libcef/browser/chrome/chrome_content_browser_client_cef_mac.mm @@ -3,12 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_content_browser_client_cef.h" +#include "cef/libcef/browser/chrome/chrome_content_browser_client_cef.h" -#include "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" +#include "cef/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" // static -std::unique_ptr ChromeContentBrowserClientCef::CreateWebContentsViewDelegate(content::WebContents* web_contents) { +std::unique_ptr +ChromeContentBrowserClientCef::CreateWebContentsViewDelegate( + content::WebContents* web_contents) { return std::make_unique(web_contents); } - diff --git a/libcef/browser/chrome/chrome_context_menu_handler.cc b/libcef/browser/chrome/chrome_context_menu_handler.cc index eacd6eae8..a52ecd5e5 100644 --- a/libcef/browser/chrome/chrome_context_menu_handler.cc +++ b/libcef/browser/chrome/chrome_context_menu_handler.cc @@ -2,15 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/chrome/chrome_context_menu_handler.h" +#include "cef/libcef/browser/chrome/chrome_context_menu_handler.h" #include "base/memory/weak_ptr.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/context_menu_params_impl.h" -#include "libcef/browser/simple_menu_model_impl.h" - +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/context_menu_params_impl.h" +#include "cef/libcef/browser/simple_menu_model_impl.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" namespace context_menu { diff --git a/libcef/browser/chrome/chrome_devtools_window_runner.cc b/libcef/browser/chrome/chrome_devtools_window_runner.cc index 63188426c..e247e9171 100644 --- a/libcef/browser/chrome/chrome_devtools_window_runner.cc +++ b/libcef/browser/chrome/chrome_devtools_window_runner.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_devtools_window_runner.h" - -#include "libcef/browser/chrome/chrome_browser_host_impl.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/chrome/chrome_devtools_window_runner.h" +#include "cef/libcef/browser/chrome/chrome_browser_host_impl.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/devtools/devtools_window.h" void ChromeDevToolsWindowRunner::ShowDevTools( diff --git a/libcef/browser/chrome/chrome_devtools_window_runner.h b/libcef/browser/chrome/chrome_devtools_window_runner.h index 99689b257..c4d33e8db 100644 --- a/libcef/browser/chrome/chrome_devtools_window_runner.h +++ b/libcef/browser/chrome/chrome_devtools_window_runner.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_CHROME_CHROME_DEVTOOLS_WINDOW_RUNNER_H_ #pragma once -#include "libcef/browser/devtools/devtools_window_runner.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/devtools/devtools_window_runner.h" class ChromeBrowserHostImpl; diff --git a/libcef/browser/chrome/chrome_startup_browser_creator.cc b/libcef/browser/chrome/chrome_startup_browser_creator.cc index 63f6f1584..e94e63bde 100644 --- a/libcef/browser/chrome/chrome_startup_browser_creator.cc +++ b/libcef/browser/chrome/chrome_startup_browser_creator.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/chrome/chrome_startup_browser_creator.h" +#include "cef/libcef/browser/chrome/chrome_startup_browser_creator.h" #include -#include "libcef/browser/browser_context.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/command_line_impl.h" - +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/command_line_impl.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" namespace startup_browser_creator { diff --git a/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc b/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc index a37c3c73b..fedc49666 100644 --- a/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc +++ b/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" +#include "cef/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.h" -#include "libcef/browser/chrome/chrome_context_menu_handler.h" +#include "cef/libcef/browser/chrome/chrome_context_menu_handler.h" ChromeWebContentsViewDelegateCef::ChromeWebContentsViewDelegateCef( content::WebContents* web_contents) diff --git a/libcef/browser/chrome/chrome_web_contents_view_delegate_cef_mac.mm b/libcef/browser/chrome/chrome_web_contents_view_delegate_cef_mac.mm index 87fdb67f1..dfb6fb1b4 100644 --- a/libcef/browser/chrome/chrome_web_contents_view_delegate_cef_mac.mm +++ b/libcef/browser/chrome/chrome_web_contents_view_delegate_cef_mac.mm @@ -3,4 +3,4 @@ // found in the LICENSE file. // Work around ChromeWebContentsViewDelegateViewsMac containing ObjC references. -#include "libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc" +#include "cef/libcef/browser/chrome/chrome_web_contents_view_delegate_cef.cc" diff --git a/libcef/browser/chrome/extensions/chrome_extension_util.cc b/libcef/browser/chrome/extensions/chrome_extension_util.cc index 3bee3ad00..dc8275a45 100644 --- a/libcef/browser/chrome/extensions/chrome_extension_util.cc +++ b/libcef/browser/chrome/extensions/chrome_extension_util.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/extensions/chrome_extension_util.h" - -#include "libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/chrome/extensions/chrome_extension_util.h" +#include "cef/libcef/browser/browser_host_base.h" #include "chrome/browser/profiles/profile.h" #include "components/sessions/content/session_tab_helper.h" #include "content/public/browser/render_frame_host.h" diff --git a/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc b/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc index fc08dcedc..6d57921bc 100644 --- a/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc +++ b/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/chrome/chrome_context_menu_handler.h" -#include "libcef/browser/osr/web_contents_view_osr.h" +#include "cef/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/chrome/chrome_context_menu_handler.h" +#include "cef/libcef/browser/osr/web_contents_view_osr.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" namespace extensions { diff --git a/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.cc b/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.cc index 8d4fc7465..f5f5af920 100644 --- a/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.cc +++ b/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h" -#include "include/views/cef_browser_view.h" -#include "libcef/browser/chrome/views/chrome_child_window.h" +#include "cef/include/views/cef_browser_view.h" +#include "cef/libcef/browser/chrome/views/chrome_child_window.h" CefBrowserPlatformDelegateChromeChildWindow:: CefBrowserPlatformDelegateChromeChildWindow( diff --git a/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h b/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h index fadb4b195..52f850591 100644 --- a/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h +++ b/libcef/browser/chrome/views/browser_platform_delegate_chrome_child_window.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_CHROME_VIEWS_BROWSER_PLATFORM_DELEGATE_CHROME_CHILD_WINDOW_H_ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_BROWSER_PLATFORM_DELEGATE_CHROME_CHILD_WINDOW_H_ -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" // Implementation of Chrome-based browser functionality. class CefBrowserPlatformDelegateChromeChildWindow diff --git a/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.cc b/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.cc index 7a8ec7563..4719cc14f 100644 --- a/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.cc +++ b/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" - -#include "include/views/cef_window.h" -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" +#include "cef/include/views/cef_window.h" +#include "cef/libcef/browser/views/window_impl.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/ui/browser.h" #include "components/zoom/zoom_controller.h" diff --git a/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h b/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h index 5973e9923..094ac0e9d 100644 --- a/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h +++ b/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h @@ -5,8 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_CHROME_VIEWS_BROWSER_PLATFORM_DELEGATE_CHROME_VIEWS_H_ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_BROWSER_PLATFORM_DELEGATE_CHROME_VIEWS_H_ -#include "libcef/browser/chrome/browser_platform_delegate_chrome.h" -#include "libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/chrome/browser_platform_delegate_chrome.h" +#include "cef/libcef/browser/views/browser_view_impl.h" class CefWindowImpl; diff --git a/libcef/browser/chrome/views/chrome_browser_frame.cc b/libcef/browser/chrome/views/chrome_browser_frame.cc index 3b7487d13..f1c2225ed 100644 --- a/libcef/browser/chrome/views/chrome_browser_frame.cc +++ b/libcef/browser/chrome/views/chrome_browser_frame.cc @@ -2,20 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/chrome_browser_frame.h" - -#include "libcef/browser/chrome/chrome_browser_host_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/window_view.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_frame.h" +#include "cef/libcef/browser/chrome/chrome_browser_host_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/window_view.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/views/frame/browser_view.h" #if BUILDFLAG(IS_MAC) -#include "libcef/browser/views/native_widget_mac.h" -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/native_widget_mac.h" +#include "cef/libcef/browser/views/view_util.h" #include "ui/views/widget/native_widget_private.h" #endif diff --git a/libcef/browser/chrome/views/chrome_browser_frame.h b/libcef/browser/chrome/views/chrome_browser_frame.h index dd636bf4a..7984dee3e 100644 --- a/libcef/browser/chrome/views/chrome_browser_frame.h +++ b/libcef/browser/chrome/views/chrome_browser_frame.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_CHROME_BROWSER_FRAME_H_ #pragma once -#include "libcef/browser/views/color_provider_tracker.h" -#include "libcef/browser/views/widget.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/views/color_provider_tracker.h" +#include "cef/libcef/browser/views/widget.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_frame.h" diff --git a/libcef/browser/chrome/views/chrome_browser_view.cc b/libcef/browser/chrome/views/chrome_browser_view.cc index 1c8df6641..0a6e638a6 100644 --- a/libcef/browser/chrome/views/chrome_browser_view.cc +++ b/libcef/browser/chrome/views/chrome_browser_view.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/chrome_browser_view.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_view.h" -#include "libcef/browser/chrome/views/chrome_browser_frame.h" -#include "libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_frame.h" +#include "cef/libcef/browser/views/browser_view_impl.h" ChromeBrowserView::ChromeBrowserView(CefBrowserViewImpl* cef_browser_view) : ParentClass(cef_browser_view->delegate()), diff --git a/libcef/browser/chrome/views/chrome_browser_view.h b/libcef/browser/chrome/views/chrome_browser_view.h index c41b572a2..426eb091e 100644 --- a/libcef/browser/chrome/views/chrome_browser_view.h +++ b/libcef/browser/chrome/views/chrome_browser_view.h @@ -6,12 +6,11 @@ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_CHROME_BROWSER_VIEW_H_ #pragma once -#include "include/views/cef_browser_view.h" -#include "include/views/cef_browser_view_delegate.h" -#include "libcef/browser/chrome/views/toolbar_view_impl.h" -#include "libcef/browser/views/browser_view_view.h" -#include "libcef/browser/views/view_view.h" - +#include "cef/include/views/cef_browser_view.h" +#include "cef/include/views/cef_browser_view_delegate.h" +#include "cef/libcef/browser/chrome/views/toolbar_view_impl.h" +#include "cef/libcef/browser/views/browser_view_view.h" +#include "cef/libcef/browser/views/view_view.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" diff --git a/libcef/browser/chrome/views/chrome_child_window.cc b/libcef/browser/chrome/views/chrome_child_window.cc index a04e18e5a..360f85f56 100644 --- a/libcef/browser/chrome/views/chrome_child_window.cc +++ b/libcef/browser/chrome/views/chrome_child_window.cc @@ -2,16 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/chrome_child_window.h" - -#include "libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/chrome/views/chrome_child_window.h" +#include "cef/libcef/browser/chrome/views/browser_platform_delegate_chrome_views.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/window_impl.h" #include "ui/gfx/native_widget_types.h" #if BUILDFLAG(IS_WIN) -#include "libcef/browser/native/browser_platform_delegate_native_win.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_win.h" #include "ui/views/win/hwnd_util.h" #endif diff --git a/libcef/browser/chrome/views/chrome_child_window.h b/libcef/browser/chrome/views/chrome_child_window.h index e3b3ce2ce..397eadd53 100644 --- a/libcef/browser/chrome/views/chrome_child_window.h +++ b/libcef/browser/chrome/views/chrome_child_window.h @@ -6,8 +6,8 @@ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_CHROME_CHILD_WINDOW_H_ #pragma once -#include "include/views/cef_browser_view_delegate.h" -#include "libcef/browser/browser_host_base.h" +#include "cef/include/views/cef_browser_view_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" namespace chrome_child_window { diff --git a/libcef/browser/chrome/views/chrome_views_util.cc b/libcef/browser/chrome/views/chrome_views_util.cc index 83254ab04..24870b0f6 100644 --- a/libcef/browser/chrome/views/chrome_views_util.cc +++ b/libcef/browser/chrome/views/chrome_views_util.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/chrome_views_util.h" +#include "cef/libcef/browser/chrome/views/chrome_views_util.h" -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/view_util.h" namespace cef { diff --git a/libcef/browser/chrome/views/toolbar_view_impl.cc b/libcef/browser/chrome/views/toolbar_view_impl.cc index e66797da2..48938b53b 100644 --- a/libcef/browser/chrome/views/toolbar_view_impl.cc +++ b/libcef/browser/chrome/views/toolbar_view_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/toolbar_view_impl.h" +#include "cef/libcef/browser/chrome/views/toolbar_view_impl.h" // static CefRefPtr CefToolbarViewImpl::Create( diff --git a/libcef/browser/chrome/views/toolbar_view_impl.h b/libcef/browser/chrome/views/toolbar_view_impl.h index 63638c904..7ce1b04e3 100644 --- a/libcef/browser/chrome/views/toolbar_view_impl.h +++ b/libcef/browser/chrome/views/toolbar_view_impl.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_TOOLBAR_VIEW_IMPL_H_ #pragma once -#include "include/views/cef_view_delegate.h" - -#include "libcef/browser/chrome/views/toolbar_view_view.h" -#include "libcef/browser/views/view_impl.h" +#include "cef/include/views/cef_view_delegate.h" +#include "cef/libcef/browser/chrome/views/toolbar_view_view.h" +#include "cef/libcef/browser/views/view_impl.h" class Browser; class BrowserView; diff --git a/libcef/browser/chrome/views/toolbar_view_view.cc b/libcef/browser/chrome/views/toolbar_view_view.cc index 28bebb8d2..13a395d6e 100644 --- a/libcef/browser/chrome/views/toolbar_view_view.cc +++ b/libcef/browser/chrome/views/toolbar_view_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/chrome/views/toolbar_view_view.h" +#include "cef/libcef/browser/chrome/views/toolbar_view_view.h" CefToolbarViewView::CefToolbarViewView(CefViewDelegate* cef_delegate, Browser* browser, diff --git a/libcef/browser/chrome/views/toolbar_view_view.h b/libcef/browser/chrome/views/toolbar_view_view.h index 0fe8eca25..ac798b05b 100644 --- a/libcef/browser/chrome/views/toolbar_view_view.h +++ b/libcef/browser/chrome/views/toolbar_view_view.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_CHROME_VIEWS_TOOLBAR_VIEW_VIEW_H_ #pragma once -#include "libcef/browser/views/view_view.h" - +#include "cef/libcef/browser/views/view_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" class CefToolbarViewView : public CefViewView { diff --git a/libcef/browser/context.cc b/libcef/browser/context.cc index 5045fd221..0d19d9ea0 100644 --- a/libcef/browser/context.cc +++ b/libcef/browser/context.cc @@ -2,21 +2,20 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/context.h" +#include "cef/libcef/browser/context.h" #include -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/trace_subscriber.h" -#include "libcef/common/cef_switches.h" - #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/current_thread.h" #include "base/threading/thread_restrictions.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/trace_subscriber.h" +#include "cef/libcef/common/cef_switches.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" @@ -25,9 +24,9 @@ #if BUILDFLAG(IS_WIN) #include "base/debug/alias.h" #include "base/strings/utf_string_conversions.h" +#include "cef/include/internal/cef_win.h" #include "chrome/chrome_elf/chrome_elf_main.h" #include "chrome/install_static/initialize_from_primary_module.h" -#include "include/internal/cef_win.h" #endif namespace { diff --git a/libcef/browser/context.h b/libcef/browser/context.h index 2d29390f2..d62853dec 100644 --- a/libcef/browser/context.h +++ b/libcef/browser/context.h @@ -10,11 +10,10 @@ #include #include -#include "include/cef_app.h" -#include "libcef/browser/main_runner.h" - #include "base/observer_list.h" #include "base/threading/platform_thread.h" +#include "cef/include/cef_app.h" +#include "cef/libcef/browser/main_runner.h" #include "third_party/skia/include/core/SkColor.h" class CefBrowserInfoManager; diff --git a/libcef/browser/context_menu_params_impl.cc b/libcef/browser/context_menu_params_impl.cc index fe3be41d1..a8a77446d 100644 --- a/libcef/browser/context_menu_params_impl.cc +++ b/libcef/browser/context_menu_params_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/context_menu_params_impl.h" +#include "cef/libcef/browser/context_menu_params_impl.h" #include "base/logging.h" #include "third_party/blink/public/mojom/context_menu/context_menu.mojom.h" diff --git a/libcef/browser/context_menu_params_impl.h b/libcef/browser/context_menu_params_impl.h index 782848a03..6ebcbfb1c 100644 --- a/libcef/browser/context_menu_params_impl.h +++ b/libcef/browser/context_menu_params_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_CONTEXT_MENU_PARAMS_IMPL_H_ #pragma once -#include "include/cef_context_menu_handler.h" -#include "libcef/common/value_base.h" - +#include "cef/include/cef_context_menu_handler.h" +#include "cef/libcef/common/value_base.h" #include "content/public/browser/context_menu_params.h" // CefContextMenuParams implementation. This class is not thread safe. diff --git a/libcef/browser/devtools/devtools_controller.cc b/libcef/browser/devtools/devtools_controller.cc index 182beb8f1..18bf94b70 100644 --- a/libcef/browser/devtools/devtools_controller.cc +++ b/libcef/browser/devtools/devtools_controller.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/devtools/devtools_controller.h" - -#include "libcef/browser/devtools/devtools_util.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/devtools/devtools_controller.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "cef/libcef/browser/devtools/devtools_util.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/devtools_agent_host.h" CefDevToolsController::CefDevToolsController( diff --git a/libcef/browser/devtools/devtools_protocol_manager.cc b/libcef/browser/devtools/devtools_protocol_manager.cc index d8c89c87f..eda87f761 100644 --- a/libcef/browser/devtools/devtools_protocol_manager.cc +++ b/libcef/browser/devtools/devtools_protocol_manager.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/devtools/devtools_protocol_manager.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/devtools/devtools_controller.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/devtools/devtools_protocol_manager.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/devtools/devtools_controller.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/web_contents.h" namespace { diff --git a/libcef/browser/devtools/devtools_protocol_manager.h b/libcef/browser/devtools/devtools_protocol_manager.h index 5b12159da..a02738492 100644 --- a/libcef/browser/devtools/devtools_protocol_manager.h +++ b/libcef/browser/devtools/devtools_protocol_manager.h @@ -8,7 +8,7 @@ #include -#include "include/cef_browser.h" +#include "cef/include/cef_browser.h" class CefBrowserHostBase; class CefDevToolsController; diff --git a/libcef/browser/devtools/devtools_util.cc b/libcef/browser/devtools/devtools_util.cc index d4228b39f..a5801d7e6 100644 --- a/libcef/browser/devtools/devtools_util.cc +++ b/libcef/browser/devtools/devtools_util.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/devtools/devtools_util.h" +#include "cef/libcef/browser/devtools/devtools_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/libcef/browser/devtools/devtools_util_unittest.cc b/libcef/browser/devtools/devtools_util_unittest.cc index ec41edef2..96909e361 100644 --- a/libcef/browser/devtools/devtools_util_unittest.cc +++ b/libcef/browser/devtools/devtools_util_unittest.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/devtools/devtools_util.h" +#include "cef/libcef/browser/devtools/devtools_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/libcef/browser/devtools/devtools_window_runner.h b/libcef/browser/devtools/devtools_window_runner.h index f3d00493e..b94f9b818 100644 --- a/libcef/browser/devtools/devtools_window_runner.h +++ b/libcef/browser/devtools/devtools_window_runner.h @@ -8,7 +8,7 @@ #include -#include "include/cef_client.h" +#include "cef/include/cef_client.h" class CefBrowserHostBase; diff --git a/libcef/browser/devtools/devtools_window_runner_create.cc b/libcef/browser/devtools/devtools_window_runner_create.cc index 8fb6f3455..cc88a43bc 100644 --- a/libcef/browser/devtools/devtools_window_runner_create.cc +++ b/libcef/browser/devtools/devtools_window_runner_create.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/devtools/devtools_window_runner.h" - -#include "libcef/browser/chrome/chrome_devtools_window_runner.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/browser/chrome/chrome_devtools_window_runner.h" +#include "cef/libcef/browser/devtools/devtools_window_runner.h" +#include "cef/libcef/features/runtime.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/alloy/devtools/alloy_devtools_window_runner.h" +#include "cef/libcef/browser/alloy/devtools/alloy_devtools_window_runner.h" #endif // static diff --git a/libcef/browser/download_item_impl.cc b/libcef/browser/download_item_impl.cc index 08e74af45..640ef040f 100644 --- a/libcef/browser/download_item_impl.cc +++ b/libcef/browser/download_item_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/download_item_impl.h" - -#include "libcef/common/time_util.h" +#include "cef/libcef/browser/download_item_impl.h" +#include "cef/libcef/common/time_util.h" #include "components/download/public/common/download_item.h" #include "url/gurl.h" diff --git a/libcef/browser/download_item_impl.h b/libcef/browser/download_item_impl.h index 231140146..bf73d623c 100644 --- a/libcef/browser/download_item_impl.h +++ b/libcef/browser/download_item_impl.h @@ -6,8 +6,8 @@ #define CEF_LIBCEF_BROWSER_DOWNLOAD_ITEM_IMPL_H_ #pragma once -#include "include/cef_download_item.h" -#include "libcef/common/value_base.h" +#include "cef/include/cef_download_item.h" +#include "cef/libcef/common/value_base.h" namespace download { class DownloadItem; diff --git a/libcef/browser/download_manager_delegate.cc b/libcef/browser/download_manager_delegate.cc index f69086d49..a75a9da3e 100644 --- a/libcef/browser/download_manager_delegate.cc +++ b/libcef/browser/download_manager_delegate.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/download_manager_delegate.h" +#include "cef/libcef/browser/download_manager_delegate.h" -#include "libcef/browser/download_manager_delegate_impl.h" -#include "libcef/features/runtime_checks.h" +#include "cef/libcef/browser/download_manager_delegate_impl.h" +#include "cef/libcef/features/runtime_checks.h" namespace cef { diff --git a/libcef/browser/download_manager_delegate_impl.cc b/libcef/browser/download_manager_delegate_impl.cc index 2322b0c92..e993febcb 100644 --- a/libcef/browser/download_manager_delegate_impl.cc +++ b/libcef/browser/download_manager_delegate_impl.cc @@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/download_manager_delegate_impl.h" +#include "cef/libcef/browser/download_manager_delegate_impl.h" #include -#include "include/cef_download_handler.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/context.h" -#include "libcef/browser/download_item_impl.h" -#include "libcef/browser/thread_util.h" - #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/include/cef_download_handler.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/download_item_impl.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_item_utils.h" #include "content/public/browser/web_contents.h" diff --git a/libcef/browser/download_manager_delegate_impl.h b/libcef/browser/download_manager_delegate_impl.h index bef450e94..af93c1ffe 100644 --- a/libcef/browser/download_manager_delegate_impl.h +++ b/libcef/browser/download_manager_delegate_impl.h @@ -8,10 +8,9 @@ #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/download_manager_delegate.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/download_manager_delegate.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_target_info.h" #include "content/public/browser/download_manager.h" diff --git a/libcef/browser/extension_impl.cc b/libcef/browser/extension_impl.cc index 756f29a4c..ec69bbda4 100644 --- a/libcef/browser/extension_impl.cc +++ b/libcef/browser/extension_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/extension_impl.h" - -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/values_impl.h" +#include "cef/libcef/browser/extension_impl.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/values_impl.h" #include "extensions/common/extension.h" CefExtensionImpl::CefExtensionImpl(const extensions::Extension* extension, diff --git a/libcef/browser/extension_impl.h b/libcef/browser/extension_impl.h index 482e98c27..8e8697058 100644 --- a/libcef/browser/extension_impl.h +++ b/libcef/browser/extension_impl.h @@ -8,9 +8,9 @@ #include -#include "include/cef_extension.h" -#include "include/cef_extension_handler.h" -#include "include/cef_request_context.h" +#include "cef/include/cef_extension.h" +#include "cef/include/cef_extension_handler.h" +#include "cef/include/cef_request_context.h" namespace extensions { class Extension; diff --git a/libcef/browser/extensions/alloy_extensions_util.cc b/libcef/browser/extensions/alloy_extensions_util.cc index 68a718f4d..2f8304b7a 100644 --- a/libcef/browser/extensions/alloy_extensions_util.cc +++ b/libcef/browser/extensions/alloy_extensions_util.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/extensions/alloy_extensions_util.h" +#include "cef/libcef/browser/extensions/alloy_extensions_util.h" -#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" namespace extensions::alloy { diff --git a/libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc b/libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc index 25b858c26..14361827a 100644 --- a/libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc +++ b/libcef/browser/extensions/api/file_system/cef_file_system_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/api/file_system/cef_file_system_delegate.h" +#include "cef/libcef/browser/extensions/api/file_system/cef_file_system_delegate.h" #include "apps/saved_files_service.h" #include "base/files/file_path.h" diff --git a/libcef/browser/extensions/api/storage/sync_value_store_cache.cc b/libcef/browser/extensions/api/storage/sync_value_store_cache.cc index a52df6ad2..8b9f55e36 100644 --- a/libcef/browser/extensions/api/storage/sync_value_store_cache.cc +++ b/libcef/browser/extensions/api/storage/sync_value_store_cache.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/api/storage/sync_value_store_cache.h" +#include "cef/libcef/browser/extensions/api/storage/sync_value_store_cache.h" #include diff --git a/libcef/browser/extensions/api/tabs/tabs_api.cc b/libcef/browser/extensions/api/tabs/tabs_api.cc index d350f9798..463c3f1e3 100644 --- a/libcef/browser/extensions/api/tabs/tabs_api.cc +++ b/libcef/browser/extensions/api/tabs/tabs_api.cc @@ -2,13 +2,12 @@ // 2012 The Chromium 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 "libcef/browser/extensions/api/tabs/tabs_api.h" - -#include "libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/browser/extensions/api/tabs/tabs_api.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "components/zoom/zoom_controller.h" diff --git a/libcef/browser/extensions/api/tabs/tabs_api.h b/libcef/browser/extensions/api/tabs/tabs_api.h index d35b76e40..0d8071e9b 100644 --- a/libcef/browser/extensions/api/tabs/tabs_api.h +++ b/libcef/browser/extensions/api/tabs/tabs_api.h @@ -5,8 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_API_H_ #define CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_API_H_ -#include "libcef/browser/extensions/extension_function_details.h" - +#include "cef/libcef/browser/extensions/extension_function_details.h" #include "chrome/common/extensions/api/tabs.h" #include "extensions/browser/api/execute_code_function.h" #include "extensions/browser/extension_function.h" diff --git a/libcef/browser/extensions/browser_extensions_util.cc b/libcef/browser/extensions/browser_extensions_util.cc index 32c43295e..602583b0a 100644 --- a/libcef/browser/extensions/browser_extensions_util.cc +++ b/libcef/browser/extensions/browser_extensions_util.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" diff --git a/libcef/browser/extensions/browser_platform_delegate_background.cc b/libcef/browser/extensions/browser_platform_delegate_background.cc index b1c892303..c066123b8 100644 --- a/libcef/browser/extensions/browser_platform_delegate_background.cc +++ b/libcef/browser/extensions/browser_platform_delegate_background.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/browser_platform_delegate_background.h" +#include "cef/libcef/browser/extensions/browser_platform_delegate_background.h" #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/features/runtime_checks.h" - +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/features/runtime_checks.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" diff --git a/libcef/browser/extensions/browser_platform_delegate_background.h b/libcef/browser/extensions/browser_platform_delegate_background.h index 29ed20f42..b34963c8c 100644 --- a/libcef/browser/extensions/browser_platform_delegate_background.h +++ b/libcef/browser/extensions/browser_platform_delegate_background.h @@ -5,8 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_VIEWS_BROWSER_PLATFORM_DELEGATE_BACKGROUND_H_ #define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_PLATFORM_DELEGATE_BACKGROUND_H_ -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" -#include "libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" // Implementation of browser functionality for background script hosts. class CefBrowserPlatformDelegateBackground diff --git a/libcef/browser/extensions/chrome_api_registration.cc b/libcef/browser/extensions/chrome_api_registration.cc index c4a8e2a49..21045d773 100644 --- a/libcef/browser/extensions/chrome_api_registration.cc +++ b/libcef/browser/extensions/chrome_api_registration.cc @@ -7,10 +7,9 @@ // CefExtensionsDispatcherDelegate::PopulateSourceMap. See // libcef/common/extensions/api/README.txt for additional details. -#include "libcef/browser/extensions/chrome_api_registration.h" - -#include "libcef/browser/extensions/api/tabs/tabs_api.h" +#include "cef/libcef/browser/extensions/chrome_api_registration.h" +#include "cef/libcef/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" #include "chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.h" #include "chrome/browser/extensions/api/resources_private/resources_private_api.h" diff --git a/libcef/browser/extensions/component_extension_resource_manager.cc b/libcef/browser/extensions/component_extension_resource_manager.cc index e3ba6cb6f..53962608c 100644 --- a/libcef/browser/extensions/component_extension_resource_manager.cc +++ b/libcef/browser/extensions/component_extension_resource_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/component_extension_resource_manager.h" +#include "cef/libcef/browser/extensions/component_extension_resource_manager.h" #include "base/containers/contains.h" #include "base/logging.h" diff --git a/libcef/browser/extensions/extension_background_host.cc b/libcef/browser/extensions/extension_background_host.cc index 37fe38b8f..80c60ef6b 100644 --- a/libcef/browser/extensions/extension_background_host.cc +++ b/libcef/browser/extensions/extension_background_host.cc @@ -2,12 +2,11 @@ // 2013 The Chromium 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 "libcef/browser/extensions/extension_background_host.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/extensions/extension_host_delegate.h" +#include "cef/libcef/browser/extensions/extension_background_host.h" #include "base/functional/callback.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/extensions/extension_host_delegate.h" namespace extensions { diff --git a/libcef/browser/extensions/extension_function_details.cc b/libcef/browser/extensions/extension_function_details.cc index caba29878..63d74357e 100644 --- a/libcef/browser/extensions/extension_function_details.cc +++ b/libcef/browser/extensions/extension_function_details.cc @@ -2,19 +2,18 @@ // 2014 The Chromium 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 "libcef/browser/extensions/extension_function_details.h" +#include "cef/libcef/browser/extensions/extension_function_details.h" #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/extensions/browser_extensions_util.h" -#include "libcef/browser/extensions/extension_system.h" -#include "libcef/browser/thread_util.h" - #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" diff --git a/libcef/browser/extensions/extension_function_details.h b/libcef/browser/extensions/extension_function_details.h index 90d7f7800..ec8bb7b24 100644 --- a/libcef/browser/extensions/extension_function_details.h +++ b/libcef/browser/extensions/extension_function_details.h @@ -5,11 +5,9 @@ #ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DETAILS_H_ #define CEF_LIBCEF_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DETAILS_H_ -#include "libcef/browser/alloy/alloy_browser_host_impl.h" - -#include "include/cef_extension.h" - #include "base/functional/callback_forward.h" +#include "cef/include/cef_extension.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include "chrome/common/extensions/api/tabs.h" #include "ui/gfx/native_widget_types.h" diff --git a/libcef/browser/extensions/extension_host_delegate.cc b/libcef/browser/extensions/extension_host_delegate.cc index 5731781a4..f7a815686 100644 --- a/libcef/browser/extensions/extension_host_delegate.cc +++ b/libcef/browser/extensions/extension_host_delegate.cc @@ -2,11 +2,10 @@ // 2014 The Chromium 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 "libcef/browser/extensions/extension_host_delegate.h" - -#include "libcef/browser/extensions/extensions_browser_client.h" +#include "cef/libcef/browser/extensions/extension_host_delegate.h" #include "base/logging.h" +#include "cef/libcef/browser/extensions/extensions_browser_client.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" diff --git a/libcef/browser/extensions/extension_system.cc b/libcef/browser/extensions/extension_system.cc index 9dafaa36a..67010ead3 100644 --- a/libcef/browser/extensions/extension_system.cc +++ b/libcef/browser/extensions/extension_system.cc @@ -3,15 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/extensions/extension_system.h" #include -#include "libcef/browser/extension_impl.h" -#include "libcef/browser/extensions/value_store/cef_value_store_factory.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/extensions/extensions_util.h" - #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -21,6 +16,10 @@ #include "base/strings/string_tokenizer.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" +#include "cef/libcef/browser/extension_impl.h" +#include "cef/libcef/browser/extensions/value_store/cef_value_store_factory.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "chrome/browser/pdf/pdf_extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" diff --git a/libcef/browser/extensions/extension_system.h b/libcef/browser/extensions/extension_system.h index e415a1647..7c378a64f 100644 --- a/libcef/browser/extensions/extension_system.h +++ b/libcef/browser/extensions/extension_system.h @@ -9,11 +9,10 @@ #include #include -#include "include/cef_extension_handler.h" -#include "include/cef_request_context.h" - #include "base/memory/weak_ptr.h" #include "base/one_shot_event.h" +#include "cef/include/cef_extension_handler.h" +#include "cef/include/cef_request_context.h" #include "extensions/browser/extension_system.h" namespace base { diff --git a/libcef/browser/extensions/extension_system_factory.cc b/libcef/browser/extensions/extension_system_factory.cc index c49791c22..741df82f3 100644 --- a/libcef/browser/extensions/extension_system_factory.cc +++ b/libcef/browser/extensions/extension_system_factory.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extension_system_factory.h" - -#include "libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/extensions/extension_system_factory.h" +#include "cef/libcef/browser/extensions/extension_system.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_prefs_factory.h" diff --git a/libcef/browser/extensions/extension_view_host.cc b/libcef/browser/extensions/extension_view_host.cc index 141eeb975..8c69be73c 100644 --- a/libcef/browser/extensions/extension_view_host.cc +++ b/libcef/browser/extensions/extension_view_host.cc @@ -2,11 +2,10 @@ // 2013 The Chromium 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 "libcef/browser/extensions/extension_view_host.h" - -#include "libcef/browser/browser_platform_delegate.h" -#include "libcef/browser/extensions/extension_host_delegate.h" +#include "cef/libcef/browser/extensions/extension_view_host.h" +#include "cef/libcef/browser/browser_platform_delegate.h" +#include "cef/libcef/browser/extensions/extension_host_delegate.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/process_util.h" #include "third_party/blink/public/common/input/web_gesture_event.h" diff --git a/libcef/browser/extensions/extension_web_contents_observer.cc b/libcef/browser/extensions/extension_web_contents_observer.cc index 6be37ee0b..56240801e 100644 --- a/libcef/browser/extensions/extension_web_contents_observer.cc +++ b/libcef/browser/extensions/extension_web_contents_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" #include "chrome/common/webui_url_constants.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/libcef/browser/extensions/extensions_api_client.cc b/libcef/browser/extensions/extensions_api_client.cc index 9881026d6..c5e33fa0a 100644 --- a/libcef/browser/extensions/extensions_api_client.cc +++ b/libcef/browser/extensions/extensions_api_client.cc @@ -3,16 +3,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extensions_api_client.h" - -#include "include/internal/cef_types_wrappers.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/extensions/api/file_system/cef_file_system_delegate.h" -#include "libcef/browser/extensions/api/storage/sync_value_store_cache.h" -#include "libcef/browser/extensions/extension_web_contents_observer.h" -#include "libcef/browser/extensions/mime_handler_view_guest_delegate.h" +#include "cef/libcef/browser/extensions/extensions_api_client.h" #include "base/memory/ptr_util.h" +#include "cef/include/internal/cef_types_wrappers.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/extensions/api/file_system/cef_file_system_delegate.h" +#include "cef/libcef/browser/extensions/api/storage/sync_value_store_cache.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/browser/extensions/mime_handler_view_guest_delegate.h" #include "chrome/browser/printing/printing_init.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "components/zoom/zoom_controller.h" diff --git a/libcef/browser/extensions/extensions_browser_api_provider.cc b/libcef/browser/extensions/extensions_browser_api_provider.cc index 5abc340d7..d1682e08f 100644 --- a/libcef/browser/extensions/extensions_browser_api_provider.cc +++ b/libcef/browser/extensions/extensions_browser_api_provider.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extensions_browser_api_provider.h" -#include "libcef/browser/extensions/chrome_api_registration.h" +#include "cef/libcef/browser/extensions/extensions_browser_api_provider.h" + +#include "cef/libcef/browser/extensions/chrome_api_registration.h" // #include "cef/libcef/browser/extensions/api/generated_api_registration.h" #include "extensions/browser/api/generated_api_registration.h" diff --git a/libcef/browser/extensions/extensions_browser_client.cc b/libcef/browser/extensions/extensions_browser_client.cc index 1f01acc06..f496ee837 100644 --- a/libcef/browser/extensions/extensions_browser_client.cc +++ b/libcef/browser/extensions/extensions_browser_client.cc @@ -3,21 +3,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/extensions_browser_client.h" +#include "cef/libcef/browser/extensions/extensions_browser_client.h" #include #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/extensions/component_extension_resource_manager.h" -#include "libcef/browser/extensions/extension_system.h" -#include "libcef/browser/extensions/extension_system_factory.h" -#include "libcef/browser/extensions/extension_web_contents_observer.h" -#include "libcef/browser/extensions/extensions_api_client.h" -#include "libcef/browser/extensions/extensions_browser_api_provider.h" -#include "libcef/browser/request_context_impl.h" - +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/extensions/component_extension_resource_manager.h" +#include "cef/libcef/browser/extensions/extension_system.h" +#include "cef/libcef/browser/extensions/extension_system_factory.h" +#include "cef/libcef/browser/extensions/extension_web_contents_observer.h" +#include "cef/libcef/browser/extensions/extensions_api_client.h" +#include "cef/libcef/browser/extensions/extensions_browser_api_provider.h" +#include "cef/libcef/browser/request_context_impl.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_url_request_util.h" #include "chrome/browser/extensions/event_router_forwarder.h" diff --git a/libcef/browser/extensions/mime_handler_view_guest_delegate.cc b/libcef/browser/extensions/mime_handler_view_guest_delegate.cc index 429f1042a..9570cefc0 100644 --- a/libcef/browser/extensions/mime_handler_view_guest_delegate.cc +++ b/libcef/browser/extensions/mime_handler_view_guest_delegate.cc @@ -3,11 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/mime_handler_view_guest_delegate.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/osr/web_contents_view_osr.h" +#include "cef/libcef/browser/extensions/mime_handler_view_guest_delegate.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/osr/web_contents_view_osr.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" namespace extensions { diff --git a/libcef/browser/extensions/value_store/cef_value_store.cc b/libcef/browser/extensions/value_store/cef_value_store.cc index 45e5949d6..60f9475ba 100644 --- a/libcef/browser/extensions/value_store/cef_value_store.cc +++ b/libcef/browser/extensions/value_store/cef_value_store.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/value_store/cef_value_store.h" +#include "cef/libcef/browser/extensions/value_store/cef_value_store.h" #include #include diff --git a/libcef/browser/extensions/value_store/cef_value_store_factory.cc b/libcef/browser/extensions/value_store/cef_value_store_factory.cc index b655210ad..5bdc440f0 100644 --- a/libcef/browser/extensions/value_store/cef_value_store_factory.cc +++ b/libcef/browser/extensions/value_store/cef_value_store_factory.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/extensions/value_store/cef_value_store_factory.h" - -#include "libcef/browser/extensions/value_store/cef_value_store.h" +#include "cef/libcef/browser/extensions/value_store/cef_value_store_factory.h" #include "base/containers/contains.h" #include "base/memory/ptr_util.h" +#include "cef/libcef/browser/extensions/value_store/cef_value_store.h" #include "components/value_store/leveldb_value_store.h" namespace { diff --git a/libcef/browser/file_dialog_manager.cc b/libcef/browser/file_dialog_manager.cc index 414d3cf20..783457343 100644 --- a/libcef/browser/file_dialog_manager.cc +++ b/libcef/browser/file_dialog_manager.cc @@ -3,16 +3,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/file_dialog_manager.h" +#include "cef/libcef/browser/file_dialog_manager.h" #include -#include "include/cef_dialog_handler.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" - #include "base/strings/utf_string_conversions.h" +#include "cef/include/cef_dialog_handler.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/file_select_helper.h" #include "content/public/browser/file_select_listener.h" #include "content/public/browser/render_frame_host.h" diff --git a/libcef/browser/file_dialog_manager.h b/libcef/browser/file_dialog_manager.h index dba19fc6e..4abbb3f74 100644 --- a/libcef/browser/file_dialog_manager.h +++ b/libcef/browser/file_dialog_manager.h @@ -10,9 +10,8 @@ #include #include -#include "include/cef_browser.h" - #include "base/memory/scoped_refptr.h" +#include "cef/include/cef_browser.h" #include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/libcef/browser/file_dialog_runner.cc b/libcef/browser/file_dialog_runner.cc index 0688c05cd..aed901b02 100644 --- a/libcef/browser/file_dialog_runner.cc +++ b/libcef/browser/file_dialog_runner.cc @@ -3,11 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/file_dialog_runner.h" +#include "cef/libcef/browser/file_dialog_runner.h" +#include "cef/libcef/browser/browser_host_base.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "libcef/browser/browser_host_base.h" #include "ui/shell_dialogs/select_file_dialog_factory.h" #include "ui/shell_dialogs/select_file_policy.h" diff --git a/libcef/browser/frame_host_impl.cc b/libcef/browser/frame_host_impl.cc index 6eea90510..7fc38dade 100644 --- a/libcef/browser/frame_host_impl.cc +++ b/libcef/browser/frame_host_impl.cc @@ -2,22 +2,21 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/frame_host_impl.h" - -#include "include/cef_request.h" -#include "include/cef_stream.h" -#include "include/cef_v8.h" -#include "include/test/cef_test_helpers.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/net_service/browser_urlrequest_impl.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/net/url_util.h" -#include "libcef/common/process_message_impl.h" -#include "libcef/common/process_message_smr_impl.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/string_util.h" -#include "libcef/common/task_runner_impl.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/include/cef_request.h" +#include "cef/include/cef_stream.h" +#include "cef/include/cef_v8.h" +#include "cef/include/test/cef_test_helpers.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/net_service/browser_urlrequest_impl.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/net/url_util.h" +#include "cef/libcef/common/process_message_impl.h" +#include "cef/libcef/common/process_message_smr_impl.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/string_util.h" +#include "cef/libcef/common/task_runner_impl.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" diff --git a/libcef/browser/frame_host_impl.h b/libcef/browser/frame_host_impl.h index 2f8a9e844..c12e110e8 100644 --- a/libcef/browser/frame_host_impl.h +++ b/libcef/browser/frame_host_impl.h @@ -11,9 +11,8 @@ #include #include -#include "include/cef_frame.h" - #include "base/synchronization/lock.h" +#include "cef/include/cef_frame.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "content/public/browser/global_routing_id.h" #include "mojo/public/cpp/bindings/receiver_set.h" diff --git a/libcef/browser/geometry_util.cc b/libcef/browser/geometry_util.cc index 65e2c6ca7..e1c81923a 100644 --- a/libcef/browser/geometry_util.cc +++ b/libcef/browser/geometry_util.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/geometry_util.h" +#include "cef/libcef/browser/geometry_util.h" #include @@ -99,4 +99,4 @@ gfx::Rect SubtractOverlayFromBoundingBox(const gfx::Rect& bounds, auto result = bounds; result.Inset(insets); return result; -} \ No newline at end of file +} diff --git a/libcef/browser/geometry_util_unittest.cc b/libcef/browser/geometry_util_unittest.cc index ef8b9471c..2f19ad2bf 100644 --- a/libcef/browser/geometry_util_unittest.cc +++ b/libcef/browser/geometry_util_unittest.cc @@ -3,8 +3,8 @@ // can be found in the LICENSE file. #include "cef/libcef/browser/geometry_util.h" -#include "tests/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/rect.h" namespace { diff --git a/libcef/browser/global_preference_manager_impl.cc b/libcef/browser/global_preference_manager_impl.cc index 4259b16d8..9a718c6b1 100644 --- a/libcef/browser/global_preference_manager_impl.cc +++ b/libcef/browser/global_preference_manager_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/global_preference_manager_impl.h" - -#include "libcef/browser/context.h" -#include "libcef/browser/prefs/pref_helper.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/global_preference_manager_impl.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/prefs/pref_helper.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/browser_process.h" bool CefGlobalPreferenceManagerImpl::HasPreference(const CefString& name) { diff --git a/libcef/browser/global_preference_manager_impl.h b/libcef/browser/global_preference_manager_impl.h index d10a7f5bd..47551af81 100644 --- a/libcef/browser/global_preference_manager_impl.h +++ b/libcef/browser/global_preference_manager_impl.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_GLOBAL_PREFERENCE_MANAGER_IMPL_H_ #pragma once -#include "include/cef_preference.h" +#include "cef/include/cef_preference.h" // Implementation of the CefPreferenceManager interface for global preferences. class CefGlobalPreferenceManagerImpl : public CefPreferenceManager { diff --git a/libcef/browser/gpu/external_texture_manager.cc b/libcef/browser/gpu/external_texture_manager.cc index cf06c1070..0e52a1d2e 100644 --- a/libcef/browser/gpu/external_texture_manager.cc +++ b/libcef/browser/gpu/external_texture_manager.cc @@ -15,6 +15,7 @@ #if BUILDFLAG(IS_WIN) #include + #include "ui/gl/gl_angle_util_win.h" #include "ui/gl/gl_image_dxgi.h" #endif diff --git a/libcef/browser/hang_monitor.cc b/libcef/browser/hang_monitor.cc index 3cf1a439c..7d1a0282c 100644 --- a/libcef/browser/hang_monitor.cc +++ b/libcef/browser/hang_monitor.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/hang_monitor.h" - -#include "include/cef_client.h" -#include "libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/hang_monitor.h" #include "build/build_config.h" +#include "cef/include/cef_client.h" +#include "cef/libcef/browser/browser_host_base.h" #include "chrome/browser/hang_monitor/hang_crash_dump.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_widget_host.h" diff --git a/libcef/browser/hang_monitor.h b/libcef/browser/hang_monitor.h index afed59d5e..a34cc29ba 100644 --- a/libcef/browser/hang_monitor.h +++ b/libcef/browser/hang_monitor.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_HANG_MONITOR_H_ #pragma once -#include "include/cef_unresponsive_process_callback.h" - #include "base/functional/callback.h" +#include "cef/include/cef_unresponsive_process_callback.h" namespace content { class RenderWidgetHost; diff --git a/libcef/browser/image_impl.cc b/libcef/browser/image_impl.cc index 2a91c8f7f..576db681a 100644 --- a/libcef/browser/image_impl.cc +++ b/libcef/browser/image_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/image_impl.h" +#include "cef/libcef/browser/image_impl.h" #include diff --git a/libcef/browser/image_impl.h b/libcef/browser/image_impl.h index 36d75f4e5..17de21437 100644 --- a/libcef/browser/image_impl.h +++ b/libcef/browser/image_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_IMAGE_IMPL_H_ #pragma once -#include "include/cef_image.h" -#include "libcef/browser/thread_util.h" - +#include "cef/include/cef_image.h" +#include "cef/libcef/browser/thread_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" diff --git a/libcef/browser/iothread_state.cc b/libcef/browser/iothread_state.cc index 2b39b24a0..bb8e5b291 100644 --- a/libcef/browser/iothread_state.cc +++ b/libcef/browser/iothread_state.cc @@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/iothread_state.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/common/net/scheme_registration.h" +#include "cef/libcef/browser/iothread_state.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/net/scheme_registration.h" #include "content/browser/resource_context_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/global_routing_id.h" #include "url/gurl.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/net/scheme_handler.h" +#include "cef/libcef/browser/net/scheme_handler.h" #endif CefIOThreadState::CefIOThreadState() { diff --git a/libcef/browser/iothread_state.h b/libcef/browser/iothread_state.h index a9ee0bea0..2f081a915 100644 --- a/libcef/browser/iothread_state.h +++ b/libcef/browser/iothread_state.h @@ -6,11 +6,10 @@ #define CEF_LIBCEF_BROWSER_IOTHREAD_STATE_H_ #pragma once -#include "include/cef_request_context.h" -#include "include/cef_request_context_handler.h" -#include "include/cef_scheme.h" -#include "libcef/browser/request_context_handler_map.h" - +#include "cef/include/cef_request_context.h" +#include "cef/include/cef_request_context_handler.h" +#include "cef/include/cef_scheme.h" +#include "cef/libcef/browser/request_context_handler_map.h" #include "cef/libcef/features/features.h" #include "content/public/browser/browser_thread.h" diff --git a/libcef/browser/javascript_dialog_manager.cc b/libcef/browser/javascript_dialog_manager.cc index 509047bb8..94b4d496e 100644 --- a/libcef/browser/javascript_dialog_manager.cc +++ b/libcef/browser/javascript_dialog_manager.cc @@ -3,17 +3,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/javascript_dialog_manager.h" +#include "cef/libcef/browser/javascript_dialog_manager.h" #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/extensions/browser_extensions_util.h" -#include "libcef/browser/thread_util.h" - #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/logging.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/extensions/browser_extensions_util.h" +#include "cef/libcef/browser/thread_util.h" #include "components/javascript_dialogs/tab_modal_dialog_manager.h" namespace { diff --git a/libcef/browser/javascript_dialog_manager.h b/libcef/browser/javascript_dialog_manager.h index 241b4c1b2..38d045edd 100644 --- a/libcef/browser/javascript_dialog_manager.h +++ b/libcef/browser/javascript_dialog_manager.h @@ -10,10 +10,9 @@ #include #include -#include "include/cef_jsdialog_handler.h" -#include "libcef/browser/javascript_dialog_runner.h" - #include "base/memory/weak_ptr.h" +#include "cef/include/cef_jsdialog_handler.h" +#include "cef/libcef/browser/javascript_dialog_runner.h" #include "content/public/browser/javascript_dialog_manager.h" class CefBrowserHostBase; diff --git a/libcef/browser/main_runner.cc b/libcef/browser/main_runner.cc index 8d8f68953..985b11569 100644 --- a/libcef/browser/main_runner.cc +++ b/libcef/browser/main_runner.cc @@ -3,13 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/main_runner.h" - -#include "libcef/browser/browser_message_loop.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/chrome/chrome_main_runner_delegate.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/browser/main_runner.h" #include "base/at_exit.h" #include "base/base_switches.h" @@ -20,6 +14,11 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "cef/libcef/browser/browser_message_loop.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/chrome/chrome_main_runner_delegate.h" +#include "cef/libcef/features/runtime.h" #include "chrome/common/chrome_result_codes.h" #include "components/crash/core/app/crash_switches.h" #include "content/app/content_main_runner_impl.h" @@ -39,15 +38,17 @@ #if BUILDFLAG(IS_WIN) #include + #include #include + #include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/common/alloy/alloy_main_runner_delegate.h" +#include "cef/libcef/common/alloy/alloy_main_runner_delegate.h" #endif namespace { diff --git a/libcef/browser/main_runner.h b/libcef/browser/main_runner.h index d2cb3887a..6623a4f33 100644 --- a/libcef/browser/main_runner.h +++ b/libcef/browser/main_runner.h @@ -7,11 +7,10 @@ #define CEF_LIBCEF_BROWSER_MAIN_RUNNER_H_ #pragma once -#include "include/cef_app.h" -#include "libcef/common/main_runner_delegate.h" -#include "libcef/common/main_runner_handler.h" - #include "base/functional/callback.h" +#include "cef/include/cef_app.h" +#include "cef/libcef/common/main_runner_delegate.h" +#include "cef/libcef/common/main_runner_handler.h" #include "content/public/browser/browser_main_runner.h" namespace base { diff --git a/libcef/browser/media_access_query.cc b/libcef/browser/media_access_query.cc index ea656978a..366c867cb 100644 --- a/libcef/browser/media_access_query.cc +++ b/libcef/browser/media_access_query.cc @@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/media_access_query.h" - -#include "include/cef_permission_handler.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/media_stream_registrar.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/browser/media_access_query.h" #include "base/command_line.h" #include "base/functional/callback_helpers.h" +#include "cef/include/cef_permission_handler.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/media_stream_registrar.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/media_capture_devices_dispatcher.h" +#include "cef/libcef/browser/media_capture_devices_dispatcher.h" #endif namespace media_access_query { diff --git a/libcef/browser/media_capture_devices_dispatcher.cc b/libcef/browser/media_capture_devices_dispatcher.cc index ce05a7a59..ee1c55d89 100644 --- a/libcef/browser/media_capture_devices_dispatcher.cc +++ b/libcef/browser/media_capture_devices_dispatcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/media_capture_devices_dispatcher.h" +#include "cef/libcef/browser/media_capture_devices_dispatcher.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_registry_simple.h" diff --git a/libcef/browser/media_router/media_route_impl.cc b/libcef/browser/media_router/media_route_impl.cc index 243f58542..36f52c017 100644 --- a/libcef/browser/media_router/media_route_impl.cc +++ b/libcef/browser/media_router/media_route_impl.cc @@ -2,12 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/media_router/media_route_impl.h" +#include "cef/libcef/browser/media_router/media_route_impl.h" -#include "libcef/browser/media_router/media_router_manager.h" -#include "libcef/browser/media_router/media_sink_impl.h" -#include "libcef/browser/media_router/media_source_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/media_router/media_router_manager.h" +#include "cef/libcef/browser/media_router/media_sink_impl.h" +#include "cef/libcef/browser/media_router/media_source_impl.h" +#include "cef/libcef/browser/thread_util.h" namespace { diff --git a/libcef/browser/media_router/media_route_impl.h b/libcef/browser/media_router/media_route_impl.h index 8ca65c70d..b23eace78 100644 --- a/libcef/browser/media_router/media_route_impl.h +++ b/libcef/browser/media_router/media_route_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_MEDIA_ROUTER_MEDIA_ROUTE_IMPL_H_ #pragma once -#include "include/cef_media_router.h" -#include "libcef/browser/browser_context.h" - +#include "cef/include/cef_media_router.h" +#include "cef/libcef/browser/browser_context.h" #include "components/media_router/common/media_route.h" // Implementation of the CefMediaRoute interface. Only created on the UI thread. diff --git a/libcef/browser/media_router/media_router_impl.cc b/libcef/browser/media_router/media_router_impl.cc index af3287057..feefb67dc 100644 --- a/libcef/browser/media_router/media_router_impl.cc +++ b/libcef/browser/media_router/media_router_impl.cc @@ -2,13 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/media_router/media_router_impl.h" +#include "cef/libcef/browser/media_router/media_router_impl.h" -#include "libcef/browser/media_router/media_route_impl.h" -#include "libcef/browser/media_router/media_router_manager.h" -#include "libcef/browser/media_router/media_sink_impl.h" -#include "libcef/browser/media_router/media_source_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/media_router/media_route_impl.h" +#include "cef/libcef/browser/media_router/media_router_manager.h" +#include "cef/libcef/browser/media_router/media_sink_impl.h" +#include "cef/libcef/browser/media_router/media_source_impl.h" +#include "cef/libcef/browser/thread_util.h" namespace { diff --git a/libcef/browser/media_router/media_router_impl.h b/libcef/browser/media_router/media_router_impl.h index f0aba10e9..14d2152b7 100644 --- a/libcef/browser/media_router/media_router_impl.h +++ b/libcef/browser/media_router/media_router_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_IMPL_H_ #pragma once -#include "include/cef_media_router.h" -#include "libcef/browser/browser_context.h" - +#include "cef/include/cef_media_router.h" +#include "cef/libcef/browser/browser_context.h" #include "components/media_router/common/mojom/media_router.mojom.h" class CefRegistrationImpl; diff --git a/libcef/browser/media_router/media_router_manager.cc b/libcef/browser/media_router/media_router_manager.cc index 562e979d1..70ed1306e 100644 --- a/libcef/browser/media_router/media_router_manager.cc +++ b/libcef/browser/media_router/media_router_manager.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/media_router/media_router_manager.h" - -#include "libcef/browser/browser_context.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/media_router/media_router_manager.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/thread_util.h" #include "components/media_router/browser/media_router_factory.h" #include "components/media_router/browser/media_routes_observer.h" #include "components/media_router/browser/presentation_connection_message_observer.h" diff --git a/libcef/browser/media_router/media_router_manager.h b/libcef/browser/media_router/media_router_manager.h index 90bebabf3..5fbead4fa 100644 --- a/libcef/browser/media_router/media_router_manager.h +++ b/libcef/browser/media_router/media_router_manager.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MANAGER_H_ #pragma once -#include "include/cef_media_router.h" - #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "cef/include/cef_media_router.h" #include "chrome/browser/ui/media_router/query_result_manager.h" #include "components/media_router/browser/media_router.h" #include "components/media_router/common/mojom/media_router.mojom.h" diff --git a/libcef/browser/media_router/media_sink_impl.cc b/libcef/browser/media_router/media_sink_impl.cc index b66ad20ec..4d0ff7586 100644 --- a/libcef/browser/media_router/media_sink_impl.cc +++ b/libcef/browser/media_router/media_sink_impl.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/media_router/media_sink_impl.h" - -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/media_router/media_sink_impl.h" #include "base/strings/string_number_conversions.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h" #include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h" #include "chrome/browser/media/router/providers/cast/dual_media_sink_service.h" diff --git a/libcef/browser/media_router/media_sink_impl.h b/libcef/browser/media_router/media_sink_impl.h index 20dbdefd7..bee298061 100644 --- a/libcef/browser/media_router/media_sink_impl.h +++ b/libcef/browser/media_router/media_sink_impl.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_MEDIA_ROUTER_MEDIA_SINK_IMPL_H_ #pragma once -#include "include/cef_media_router.h" - +#include "cef/include/cef_media_router.h" #include "components/media_router/common/media_sink.h" // Implementation of the CefMediaSink interface. May be created on any thread. diff --git a/libcef/browser/media_router/media_source_impl.cc b/libcef/browser/media_router/media_source_impl.cc index e8e18a416..6d0d7782c 100644 --- a/libcef/browser/media_router/media_source_impl.cc +++ b/libcef/browser/media_router/media_source_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/media_router/media_source_impl.h" +#include "cef/libcef/browser/media_router/media_source_impl.h" CefMediaSourceImpl::CefMediaSourceImpl( const media_router::MediaSource::Id& source_id) diff --git a/libcef/browser/media_router/media_source_impl.h b/libcef/browser/media_router/media_source_impl.h index 0c9664d08..8f2fcdaae 100644 --- a/libcef/browser/media_router/media_source_impl.h +++ b/libcef/browser/media_router/media_source_impl.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_MEDIA_ROUTER_MEDIA_SOURCE_IMPL_H_ #pragma once -#include "include/cef_media_router.h" - +#include "cef/include/cef_media_router.h" #include "components/media_router/common/media_source.h" // Implementation of the CefMediaSource interface. May be created on any thread. diff --git a/libcef/browser/media_stream_registrar.cc b/libcef/browser/media_stream_registrar.cc index 4a3de13f9..1722078b0 100644 --- a/libcef/browser/media_stream_registrar.cc +++ b/libcef/browser/media_stream_registrar.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/media_stream_registrar.h" +#include "cef/libcef/browser/media_stream_registrar.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/thread_util.h" class CefMediaStreamUI : public content::MediaStreamUI { public: diff --git a/libcef/browser/menu_manager.cc b/libcef/browser/menu_manager.cc index c4cefed2d..dd2b5ef16 100644 --- a/libcef/browser/menu_manager.cc +++ b/libcef/browser/menu_manager.cc @@ -2,19 +2,18 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/menu_manager.h" +#include "cef/libcef/browser/menu_manager.h" #include #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/context_menu_params_impl.h" -#include "libcef/browser/menu_runner.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" - #include "base/logging.h" #include "cef/grit/cef_strings.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/context_menu_params_impl.h" +#include "cef/libcef/browser/menu_runner.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" diff --git a/libcef/browser/menu_manager.h b/libcef/browser/menu_manager.h index e5d185f8f..1a9a889ca 100644 --- a/libcef/browser/menu_manager.h +++ b/libcef/browser/menu_manager.h @@ -6,11 +6,9 @@ #define CEF_LIBCEF_BROWSER_MENU_MANAGER_H_ #pragma once -#include "libcef/browser/menu_model_impl.h" - -#include "libcef/browser/menu_runner.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/menu_model_impl.h" +#include "cef/libcef/browser/menu_runner.h" #include "content/public/browser/context_menu_params.h" #include "content/public/browser/web_contents_observer.h" diff --git a/libcef/browser/menu_model_impl.cc b/libcef/browser/menu_model_impl.cc index 130b03caf..52c817cd4 100644 --- a/libcef/browser/menu_model_impl.cc +++ b/libcef/browser/menu_model_impl.cc @@ -3,16 +3,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/menu_model_impl.h" +#include "cef/libcef/browser/menu_model_impl.h" #include #include -#include "libcef/browser/thread_util.h" -#include "libcef/common/task_runner_impl.h" - #include "base/functional/bind.h" #include "base/logging.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/task_runner_impl.h" #include "third_party/blink/public/mojom/context_menu/context_menu.mojom.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/models/image_model.h" diff --git a/libcef/browser/menu_model_impl.h b/libcef/browser/menu_model_impl.h index 8e4a93d77..b83d27090 100644 --- a/libcef/browser/menu_model_impl.h +++ b/libcef/browser/menu_model_impl.h @@ -9,10 +9,9 @@ #include -#include "include/cef_menu_model.h" -#include "include/cef_menu_model_delegate.h" - #include "base/threading/platform_thread.h" +#include "cef/include/cef_menu_model.h" +#include "cef/include/cef_menu_model_delegate.h" #include "third_party/blink/public/mojom/context_menu/context_menu.mojom-forward.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/font_list.h" diff --git a/libcef/browser/native/browser_platform_delegate_native.cc b/libcef/browser/native/browser_platform_delegate_native.cc index d60eebdb0..2a7baaf6b 100644 --- a/libcef/browser/native/browser_platform_delegate_native.cc +++ b/libcef/browser/native/browser_platform_delegate_native.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/browser_platform_delegate_native.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" #include "third_party/blink/public/common/input/web_mouse_event.h" diff --git a/libcef/browser/native/browser_platform_delegate_native.h b/libcef/browser/native/browser_platform_delegate_native.h index a208039a5..0d6a6ab97 100644 --- a/libcef/browser/native/browser_platform_delegate_native.h +++ b/libcef/browser/native/browser_platform_delegate_native.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_H_ #define CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_H_ -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" // Base implementation of native browser functionality. class CefBrowserPlatformDelegateNative diff --git a/libcef/browser/native/browser_platform_delegate_native_aura.cc b/libcef/browser/native/browser_platform_delegate_native_aura.cc index 83c127719..781f5cce7 100644 --- a/libcef/browser/native/browser_platform_delegate_native_aura.cc +++ b/libcef/browser/native/browser_platform_delegate_native_aura.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/browser_platform_delegate_native_aura.h" - -#include "libcef/browser/native/menu_runner_views_aura.h" -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_aura.h" +#include "cef/libcef/browser/native/menu_runner_views_aura.h" +#include "cef/libcef/browser/views/view_util.h" #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" diff --git a/libcef/browser/native/browser_platform_delegate_native_aura.h b/libcef/browser/native/browser_platform_delegate_native_aura.h index e547c5ac3..610825545 100644 --- a/libcef/browser/native/browser_platform_delegate_native_aura.h +++ b/libcef/browser/native/browser_platform_delegate_native_aura.h @@ -5,9 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_AURA_H_ #define CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_AURA_H_ -#include "libcef/browser/native/browser_platform_delegate_native.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" #include "ui/events/event.h" namespace content { diff --git a/libcef/browser/native/browser_platform_delegate_native_linux.cc b/libcef/browser/native/browser_platform_delegate_native_linux.cc index f1dc70a44..f66a7c517 100644 --- a/libcef/browser/native/browser_platform_delegate_native_linux.cc +++ b/libcef/browser/native/browser_platform_delegate_native_linux.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/browser_platform_delegate_native_linux.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/context.h" -#include "libcef/browser/native/window_delegate_view.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_linux.h" #include "base/no_destructor.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/native/window_delegate_view.h" +#include "cef/libcef/browser/thread_util.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/input/native_web_keyboard_event.h" @@ -21,7 +20,7 @@ #include "ui/views/widget/widget.h" #if BUILDFLAG(IS_OZONE_X11) -#include "libcef/browser/native/window_x11.h" +#include "cef/libcef/browser/native/window_x11.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/events/keycodes/keyboard_code_conversion_xkb.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" diff --git a/libcef/browser/native/browser_platform_delegate_native_linux.h b/libcef/browser/native/browser_platform_delegate_native_linux.h index 72b9e57fd..f8f8117a9 100644 --- a/libcef/browser/native/browser_platform_delegate_native_linux.h +++ b/libcef/browser/native/browser_platform_delegate_native_linux.h @@ -5,8 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_LINUX_H_ #define CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_LINUX_H_ -#include "libcef/browser/native/browser_platform_delegate_native_aura.h" - +#include "cef/libcef/browser/native/browser_platform_delegate_native_aura.h" #include "ui/base/ozone_buildflags.h" #if BUILDFLAG(IS_OZONE_X11) diff --git a/libcef/browser/native/browser_platform_delegate_native_mac.h b/libcef/browser/native/browser_platform_delegate_native_mac.h index 0eaaf72f9..3cdc2bc85 100644 --- a/libcef/browser/native/browser_platform_delegate_native_mac.h +++ b/libcef/browser/native/browser_platform_delegate_native_mac.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_MAC_H_ #define CEF_LIBCEF_BROWSER_NATIVE_BROWSER_PLATFORM_DELEGATE_NATIVE_MAC_H_ -#include "libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" #if defined(__OBJC__) @class CefWindowDelegate; diff --git a/libcef/browser/native/browser_platform_delegate_native_mac.mm b/libcef/browser/native/browser_platform_delegate_native_mac.mm index 90b066d6b..687ba37c0 100644 --- a/libcef/browser/native/browser_platform_delegate_native_mac.mm +++ b/libcef/browser/native/browser_platform_delegate_native_mac.mm @@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/browser_platform_delegate_native_mac.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_mac.h" #import #import -#include "include/internal/cef_types_mac.h" -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/context.h" -#include "libcef/browser/native/javascript_dialog_runner_mac.h" -#include "libcef/browser/native/menu_runner_mac.h" -#include "libcef/browser/thread_util.h" - #include "base/apple/owned_objc.h" #include "base/apple/scoped_nsautorelease_pool.h" #include "base/memory/ptr_util.h" #include "base/threading/thread_restrictions.h" +#include "cef/include/internal/cef_types_mac.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/native/javascript_dialog_runner_mac.h" +#include "cef/libcef/browser/native/menu_runner_mac.h" +#include "cef/libcef/browser/thread_util.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/libcef/browser/native/browser_platform_delegate_native_win.cc b/libcef/browser/native/browser_platform_delegate_native_win.cc index d0d61325b..37117f43f 100644 --- a/libcef/browser/native/browser_platform_delegate_native_win.cc +++ b/libcef/browser/native/browser_platform_delegate_native_win.cc @@ -2,23 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/browser_platform_delegate_native_win.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_win.h" #include #include #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/context.h" -#include "libcef/browser/geometry_util.h" -#include "libcef/browser/native/window_delegate_view.h" -#include "libcef/browser/thread_util.h" - #include "base/base_paths_win.h" #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "base/win/win_util.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/geometry_util.h" +#include "cef/libcef/browser/native/window_delegate_view.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/common/input/native_web_keyboard_event.h" #include "third_party/blink/public/common/input/web_mouse_event.h" #include "third_party/blink/public/common/input/web_mouse_wheel_event.h" diff --git a/libcef/browser/native/browser_platform_delegate_native_win.h b/libcef/browser/native/browser_platform_delegate_native_win.h index 6d26b5a3d..35cd9500e 100644 --- a/libcef/browser/native/browser_platform_delegate_native_win.h +++ b/libcef/browser/native/browser_platform_delegate_native_win.h @@ -7,7 +7,7 @@ #include -#include "libcef/browser/native/browser_platform_delegate_native_aura.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native_aura.h" // Windowed browser implementation for Windows. class CefBrowserPlatformDelegateNativeWin diff --git a/libcef/browser/native/cursor_util.cc b/libcef/browser/native/cursor_util.cc index 2fb9204a1..65971956d 100644 --- a/libcef/browser/native/cursor_util.cc +++ b/libcef/browser/native/cursor_util.cc @@ -2,10 +2,9 @@ // 2012 The Chromium 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 "libcef/browser/native/cursor_util.h" - -#include "include/cef_client.h" +#include "cef/libcef/browser/native/cursor_util.h" +#include "cef/include/cef_client.h" #include "ui/base/cursor/mojom/cursor_type.mojom.h" namespace cursor_util { diff --git a/libcef/browser/native/cursor_util.h b/libcef/browser/native/cursor_util.h index 629d0fa68..b989a3b62 100644 --- a/libcef/browser/native/cursor_util.h +++ b/libcef/browser/native/cursor_util.h @@ -5,10 +5,9 @@ #ifndef CEF_LIBCEF_BROWSER_NATIVE_CURSOR_UTIL_H_ #define CEF_LIBCEF_BROWSER_NATIVE_CURSOR_UTIL_H_ -#include "include/cef_browser.h" - #include +#include "cef/include/cef_browser.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/mojom/cursor_type.mojom-forward.h" diff --git a/libcef/browser/native/cursor_util_aura.cc b/libcef/browser/native/cursor_util_aura.cc index e7baa35f4..14bffcb62 100644 --- a/libcef/browser/native/cursor_util_aura.cc +++ b/libcef/browser/native/cursor_util_aura.cc @@ -2,10 +2,8 @@ // 2012 The Chromium 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 "libcef/browser/native/cursor_util.h" - -#include "libcef/browser/browser_host_base.h" - +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/native/cursor_util.h" #include "content/common/cursors/webcursor.h" #include "content/public/browser/render_widget_host_view.h" #include "ui/base/cursor/cursor_factory.h" diff --git a/libcef/browser/native/cursor_util_mac.mm b/libcef/browser/native/cursor_util_mac.mm index 18df8a654..33170a8c1 100644 --- a/libcef/browser/native/cursor_util_mac.mm +++ b/libcef/browser/native/cursor_util_mac.mm @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "include/internal/cef_types_mac.h" -#include "libcef/browser/native/cursor_util.h" +#include "cef/libcef/browser/native/cursor_util.h" +#include "cef/include/internal/cef_types_mac.h" #import "ui/base/cocoa/cursor_utils.h" namespace cursor_util { diff --git a/libcef/browser/native/javascript_dialog_runner_mac.h b/libcef/browser/native/javascript_dialog_runner_mac.h index 828c08fb4..b00cc2b40 100644 --- a/libcef/browser/native/javascript_dialog_runner_mac.h +++ b/libcef/browser/native/javascript_dialog_runner_mac.h @@ -7,10 +7,9 @@ #define CEF_LIBCEF_BROWSER_NATIVE_JAVASCRIPT_DIALOG_RUNNER_MAC_H_ #pragma once -#include "libcef/browser/javascript_dialog_runner.h" - #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/javascript_dialog_runner.h" #if __OBJC__ @class CefJavaScriptDialogHelper; diff --git a/libcef/browser/native/javascript_dialog_runner_mac.mm b/libcef/browser/native/javascript_dialog_runner_mac.mm index 243be68d6..cdfff2b50 100644 --- a/libcef/browser/native/javascript_dialog_runner_mac.mm +++ b/libcef/browser/native/javascript_dialog_runner_mac.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/javascript_dialog_runner_mac.h" +#include "cef/libcef/browser/native/javascript_dialog_runner_mac.h" #import diff --git a/libcef/browser/native/menu_runner_mac.h b/libcef/browser/native/menu_runner_mac.h index 125a451fe..d4057cb88 100644 --- a/libcef/browser/native/menu_runner_mac.h +++ b/libcef/browser/native/menu_runner_mac.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_NATIVE_MENU_RUNNER_MAC_H_ #pragma once -#include "libcef/browser/menu_runner.h" +#include "cef/libcef/browser/menu_runner.h" #if __OBJC__ @class MenuControllerCocoa; diff --git a/libcef/browser/native/menu_runner_mac.mm b/libcef/browser/native/menu_runner_mac.mm index 1747126af..00623a009 100644 --- a/libcef/browser/native/menu_runner_mac.mm +++ b/libcef/browser/native/menu_runner_mac.mm @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/native/menu_runner_mac.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/native/menu_runner_mac.h" #import "base/mac/scoped_sending_event.h" #include "base/task/current_thread.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #import "ui/base/cocoa/menu_controller.h" #include "ui/gfx/geometry/point.h" diff --git a/libcef/browser/native/menu_runner_views_aura.cc b/libcef/browser/native/menu_runner_views_aura.cc index a2b5e222e..8a8944973 100644 --- a/libcef/browser/native/menu_runner_views_aura.cc +++ b/libcef/browser/native/menu_runner_views_aura.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/native/menu_runner_views_aura.h" +#include "cef/libcef/browser/native/menu_runner_views_aura.h" #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" - #include "base/strings/string_util.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" #include "ui/gfx/geometry/point.h" CefMenuRunnerViewsAura::CefMenuRunnerViewsAura() = default; diff --git a/libcef/browser/native/menu_runner_views_aura.h b/libcef/browser/native/menu_runner_views_aura.h index c930441b3..d7ae2ea31 100644 --- a/libcef/browser/native/menu_runner_views_aura.h +++ b/libcef/browser/native/menu_runner_views_aura.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_NATIVE_MENU_RUNNER_VIEWS_AURA_H_ #pragma once -#include "libcef/browser/menu_runner.h" - +#include "cef/libcef/browser/menu_runner.h" #include "ui/views/controls/menu/menu_runner.h" class CefMenuRunnerViewsAura : public CefMenuRunner { diff --git a/libcef/browser/native/window_delegate_view.cc b/libcef/browser/native/window_delegate_view.cc index 13b305902..2dec779f5 100644 --- a/libcef/browser/native/window_delegate_view.cc +++ b/libcef/browser/native/window_delegate_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/native/window_delegate_view.h" +#include "cef/libcef/browser/native/window_delegate_view.h" #include diff --git a/libcef/browser/native/window_x11.cc b/libcef/browser/native/window_x11.cc index 4d28980b8..87b3a1b05 100644 --- a/libcef/browser/native/window_x11.cc +++ b/libcef/browser/native/window_x11.cc @@ -3,15 +3,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/native/window_x11.h" +#include "cef/libcef/browser/native/window_x11.h" // Include first due to redefinition of x11::EventMask. +// clang-format off #include "ui/base/x/x11_util.h" +// clang-format on -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/thread_util.h" - +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/thread_util.h" #include "net/base/network_interfaces.h" #include "ui/events/platform/platform_event_source.h" #include "ui/events/platform/x11/x11_event_source.h" diff --git a/libcef/browser/native/window_x11.h b/libcef/browser/native/window_x11.h index 0b1817909..2d2011ed5 100644 --- a/libcef/browser/native/window_x11.h +++ b/libcef/browser/native/window_x11.h @@ -7,9 +7,8 @@ #define CEF_LIBCEF_BROWSER_NATIVE_WINDOW_X11_H_ #pragma once -#include "include/internal/cef_ptr.h" - #include "base/memory/weak_ptr.h" +#include "cef/include/internal/cef_ptr.h" #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/x/atom_cache.h" diff --git a/libcef/browser/navigation_entry_impl.cc b/libcef/browser/navigation_entry_impl.cc index 669424be2..fdbe22555 100644 --- a/libcef/browser/navigation_entry_impl.cc +++ b/libcef/browser/navigation_entry_impl.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/navigation_entry_impl.h" - -#include "libcef/browser/ssl_status_impl.h" -#include "libcef/common/time_util.h" +#include "cef/libcef/browser/navigation_entry_impl.h" +#include "cef/libcef/browser/ssl_status_impl.h" +#include "cef/libcef/common/time_util.h" #include "content/public/browser/navigation_entry.h" #include "url/gurl.h" diff --git a/libcef/browser/navigation_entry_impl.h b/libcef/browser/navigation_entry_impl.h index 98e89f395..15ad68e2d 100644 --- a/libcef/browser/navigation_entry_impl.h +++ b/libcef/browser/navigation_entry_impl.h @@ -6,8 +6,8 @@ #define CEF_LIBCEF_BROWSER_NAVIGATION_ENTRY_IMPL_H_ #pragma once -#include "include/cef_navigation_entry.h" -#include "libcef/common/value_base.h" +#include "cef/include/cef_navigation_entry.h" +#include "cef/libcef/common/value_base.h" namespace content { class NavigationEntry; diff --git a/libcef/browser/net/chrome_scheme_handler.cc b/libcef/browser/net/chrome_scheme_handler.cc index 95644a8d4..92f59a8d0 100644 --- a/libcef/browser/net/chrome_scheme_handler.cc +++ b/libcef/browser/net/chrome_scheme_handler.cc @@ -3,20 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/net/chrome_scheme_handler.h" #include #include #include #include -#include "include/cef_version.h" -#include "libcef/browser/extensions/chrome_api_registration.h" -#include "libcef/browser/frame_host_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" -#include "libcef/features/runtime.h" - #include "base/command_line.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" @@ -29,6 +22,12 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "cef/grit/cef_resources.h" +#include "cef/include/cef_version.h" +#include "cef/libcef/browser/extensions/chrome_api_registration.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/devtools/devtools_ui_bindings.h" #include "chrome/browser/profiles/profile.h" diff --git a/libcef/browser/net/chrome_scheme_handler.h b/libcef/browser/net/chrome_scheme_handler.h index 6d28be54c..7b50fe2b2 100644 --- a/libcef/browser/net/chrome_scheme_handler.h +++ b/libcef/browser/net/chrome_scheme_handler.h @@ -8,10 +8,9 @@ #include -#include "include/cef_browser.h" -#include "include/cef_frame.h" -#include "include/cef_process_message.h" - +#include "cef/include/cef_browser.h" +#include "cef/include/cef_frame.h" +#include "cef/include/cef_process_message.h" #include "url/gurl.h" namespace base { diff --git a/libcef/browser/net/crlset_file_util_impl.cc b/libcef/browser/net/crlset_file_util_impl.cc index 2f799ba99..de6684eaa 100644 --- a/libcef/browser/net/crlset_file_util_impl.cc +++ b/libcef/browser/net/crlset_file_util_impl.cc @@ -2,13 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_file_util.h" - -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" - #include "base/files/file_util.h" #include "base/logging.h" +#include "cef/include/cef_file_util.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/network_service_instance.h" #include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h" diff --git a/libcef/browser/net/devtools_scheme_handler.cc b/libcef/browser/net/devtools_scheme_handler.cc index d9d0f1f17..dc356680d 100644 --- a/libcef/browser/net/devtools_scheme_handler.cc +++ b/libcef/browser/net/devtools_scheme_handler.cc @@ -2,15 +2,14 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/net/devtools_scheme_handler.h" +#include "cef/libcef/browser/net/devtools_scheme_handler.h" #include -#include "libcef/browser/iothread_state.h" -#include "libcef/browser/net/internal_scheme_handler.h" - #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" +#include "cef/libcef/browser/iothread_state.h" +#include "cef/libcef/browser/net/internal_scheme_handler.h" #include "content/public/browser/devtools_frontend_host.h" #include "content/public/common/url_constants.h" diff --git a/libcef/browser/net/internal_scheme_handler.cc b/libcef/browser/net/internal_scheme_handler.cc index b7da1d766..c1c4f05d5 100644 --- a/libcef/browser/net/internal_scheme_handler.cc +++ b/libcef/browser/net/internal_scheme_handler.cc @@ -3,17 +3,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/net/internal_scheme_handler.h" +#include "cef/libcef/browser/net/internal_scheme_handler.h" #include #include -#include "libcef/common/app_manager.h" - #include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" +#include "cef/libcef/common/app_manager.h" #include "net/base/mime_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/libcef/browser/net/internal_scheme_handler.h b/libcef/browser/net/internal_scheme_handler.h index e63c2bc62..4cb420d23 100644 --- a/libcef/browser/net/internal_scheme_handler.h +++ b/libcef/browser/net/internal_scheme_handler.h @@ -8,9 +8,8 @@ #include -#include "include/cef_scheme.h" - #include "base/memory/ref_counted_memory.h" +#include "cef/include/cef_scheme.h" #include "url/gurl.h" namespace scheme { diff --git a/libcef/browser/net/scheme_handler.cc b/libcef/browser/net/scheme_handler.cc index 347d21fa5..0a039c58a 100644 --- a/libcef/browser/net/scheme_handler.cc +++ b/libcef/browser/net/scheme_handler.cc @@ -2,15 +2,14 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/net/scheme_handler.h" +#include "cef/libcef/browser/net/scheme_handler.h" #include -#include "libcef/browser/net/chrome_scheme_handler.h" -#include "libcef/browser/net/devtools_scheme_handler.h" -#include "libcef/common/net/scheme_registration.h" -#include "libcef/features/runtime.h" - +#include "cef/libcef/browser/net/chrome_scheme_handler.h" +#include "cef/libcef/browser/net/devtools_scheme_handler.h" +#include "cef/libcef/common/net/scheme_registration.h" +#include "cef/libcef/features/runtime.h" #include "content/public/common/url_constants.h" namespace scheme { diff --git a/libcef/browser/net/scheme_handler.h b/libcef/browser/net/scheme_handler.h index a991be382..aaf7e532a 100644 --- a/libcef/browser/net/scheme_handler.h +++ b/libcef/browser/net/scheme_handler.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_NET_SCHEME_HANDLER_H_ #pragma once -#include "include/cef_frame.h" - +#include "cef/include/cef_frame.h" #include "content/public/browser/browser_context.h" #include "url/gurl.h" diff --git a/libcef/browser/net/throttle_handler.cc b/libcef/browser/net/throttle_handler.cc index 01ecf83d9..d7c7c18ef 100644 --- a/libcef/browser/net/throttle_handler.cc +++ b/libcef/browser/net/throttle_handler.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/net/throttle_handler.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_info_manager.h" -#include "libcef/browser/frame_host_impl.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/request_impl.h" +#include "cef/libcef/browser/net/throttle_handler.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_info_manager.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/request_impl.h" #include "components/navigation_interception/intercept_navigation_throttle.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/navigation_throttle.h" diff --git a/libcef/browser/net_service/browser_urlrequest_impl.cc b/libcef/browser/net_service/browser_urlrequest_impl.cc index 31055c329..6155c4b57 100644 --- a/libcef/browser/net_service/browser_urlrequest_impl.cc +++ b/libcef/browser/net_service/browser_urlrequest_impl.cc @@ -3,26 +3,25 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#include "libcef/browser/net_service/browser_urlrequest_impl.h" +#include "cef/libcef/browser/net_service/browser_urlrequest_impl.h" #include #include #include -#include "libcef/browser/browser_context.h" -#include "libcef/browser/frame_host_impl.h" -#include "libcef/browser/net_service/url_loader_factory_getter.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/net_service/net_service_util.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/response_impl.h" -#include "libcef/common/task_runner_impl.h" - #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/frame_host_impl.h" +#include "cef/libcef/browser/net_service/url_loader_factory_getter.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/net_service/net_service_util.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/response_impl.h" +#include "cef/libcef/common/task_runner_impl.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/storage_partition_impl.h" #include "content/public/browser/browser_context.h" diff --git a/libcef/browser/net_service/browser_urlrequest_impl.h b/libcef/browser/net_service/browser_urlrequest_impl.h index f166a65b7..0b1846064 100644 --- a/libcef/browser/net_service/browser_urlrequest_impl.h +++ b/libcef/browser/net_service/browser_urlrequest_impl.h @@ -8,7 +8,7 @@ #include #include -#include "include/cef_urlrequest.h" +#include "cef/include/cef_urlrequest.h" namespace content { struct GlobalRequestID; diff --git a/libcef/browser/net_service/cookie_helper.cc b/libcef/browser/net_service/cookie_helper.cc index 49b293d75..ba29c5139 100644 --- a/libcef/browser/net_service/cookie_helper.cc +++ b/libcef/browser/net_service/cookie_helper.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/net_service/cookie_helper.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/common/net_service/net_service_util.h" +#include "cef/libcef/browser/net_service/cookie_helper.h" #include "base/functional/bind.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/url_constants.h" diff --git a/libcef/browser/net_service/cookie_helper.h b/libcef/browser/net_service/cookie_helper.h index 14ab0cf79..8b8c6968f 100644 --- a/libcef/browser/net_service/cookie_helper.h +++ b/libcef/browser/net_service/cookie_helper.h @@ -5,9 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_COOKIE_HELPER_H_ #define CEF_LIBCEF_BROWSER_NET_SERVICE_COOKIE_HELPER_H_ -#include "libcef/browser/browser_context.h" - #include "base/functional/callback_forward.h" +#include "cef/libcef/browser/browser_context.h" #include "net/cookies/canonical_cookie.h" namespace net { diff --git a/libcef/browser/net_service/cookie_manager_impl.cc b/libcef/browser/net_service/cookie_manager_impl.cc index a7fcc6d41..ff07e0116 100644 --- a/libcef/browser/net_service/cookie_manager_impl.cc +++ b/libcef/browser/net_service/cookie_manager_impl.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/net_service/cookie_manager_impl.h" - -#include "libcef/common/net_service/net_service_util.h" -#include "libcef/common/time_util.h" +#include "cef/libcef/browser/net_service/cookie_manager_impl.h" #include "base/functional/bind.h" #include "base/logging.h" +#include "cef/libcef/common/net_service/net_service_util.h" +#include "cef/libcef/common/time_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" #include "services/network/public/mojom/cookie_manager.mojom.h" diff --git a/libcef/browser/net_service/cookie_manager_impl.h b/libcef/browser/net_service/cookie_manager_impl.h index 9ae1b9cbd..7c6597f3e 100644 --- a/libcef/browser/net_service/cookie_manager_impl.h +++ b/libcef/browser/net_service/cookie_manager_impl.h @@ -5,11 +5,10 @@ #ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_COOKIE_MANAGER_IMPL_H_ #define CEF_LIBCEF_BROWSER_NET_SERVICE_COOKIE_MANAGER_IMPL_H_ -#include "include/cef_cookie.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/thread_util.h" - #include "base/files/file_path.h" +#include "cef/include/cef_cookie.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/thread_util.h" // Implementation of the CefCookieManager interface. May be created on any // thread. diff --git a/libcef/browser/net_service/login_delegate.cc b/libcef/browser/net_service/login_delegate.cc index 54eb94a19..2fae39174 100644 --- a/libcef/browser/net_service/login_delegate.cc +++ b/libcef/browser/net_service/login_delegate.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/net_service/login_delegate.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/net_service/browser_urlrequest_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/net_service/login_delegate.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/net_service/browser_urlrequest_impl.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/web_contents.h" diff --git a/libcef/browser/net_service/login_delegate.h b/libcef/browser/net_service/login_delegate.h index 8732ea7b1..e5308fab1 100644 --- a/libcef/browser/net_service/login_delegate.h +++ b/libcef/browser/net_service/login_delegate.h @@ -5,9 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_LOGIN_DELEGATE_H_ #define CEF_LIBCEF_BROWSER_NET_SERVICE_LOGIN_DELEGATE_H_ -#include "include/cef_base.h" - #include "base/memory/weak_ptr.h" +#include "cef/include/cef_base.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/login_delegate.h" #include "net/base/auth.h" diff --git a/libcef/browser/net_service/proxy_url_loader_factory.cc b/libcef/browser/net_service/proxy_url_loader_factory.cc index 27d640eab..061cc46b2 100644 --- a/libcef/browser/net_service/proxy_url_loader_factory.cc +++ b/libcef/browser/net_service/proxy_url_loader_factory.cc @@ -3,20 +3,19 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#include "libcef/browser/net_service/proxy_url_loader_factory.h" +#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h" #include -#include "libcef/browser/context.h" -#include "libcef/browser/origin_whitelist_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/net/scheme_registration.h" -#include "libcef/common/net_service/net_service_util.h" - #include "base/barrier_closure.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/origin_whitelist_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/net/scheme_registration.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/render_frame_host.h" diff --git a/libcef/browser/net_service/proxy_url_loader_factory.h b/libcef/browser/net_service/proxy_url_loader_factory.h index 55270725c..e82e8d69f 100644 --- a/libcef/browser/net_service/proxy_url_loader_factory.h +++ b/libcef/browser/net_service/proxy_url_loader_factory.h @@ -9,11 +9,10 @@ #include #include -#include "libcef/browser/net_service/stream_reader_url_loader.h" - #include "base/containers/unique_ptr_adapters.h" #include "base/functional/callback.h" #include "base/hash/hash.h" +#include "cef/libcef/browser/net_service/stream_reader_url_loader.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/libcef/browser/net_service/resource_handler_wrapper.cc b/libcef/browser/net_service/resource_handler_wrapper.cc index 957a94cda..40b2dd819 100644 --- a/libcef/browser/net_service/resource_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_handler_wrapper.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/net_service/resource_handler_wrapper.h" - -#include "libcef/browser/net_service/proxy_url_loader_factory.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/net_service/net_service_util.h" -#include "libcef/common/request_impl.h" +#include "cef/libcef/browser/net_service/resource_handler_wrapper.h" #include "base/strings/string_number_conversions.h" +#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/net_service/net_service_util.h" +#include "cef/libcef/common/request_impl.h" #include "net/http/http_status_code.h" namespace net_service { diff --git a/libcef/browser/net_service/resource_handler_wrapper.h b/libcef/browser/net_service/resource_handler_wrapper.h index b47c95b08..167dd3711 100644 --- a/libcef/browser/net_service/resource_handler_wrapper.h +++ b/libcef/browser/net_service/resource_handler_wrapper.h @@ -5,8 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_RESOURCE_HANDLER_WRAPPER_H_ #define CEF_LIBCEF_BROWSER_NET_SERVICE_RESOURCE_HANDLER_WRAPPER_H_ -#include "include/cef_request.h" -#include "include/cef_resource_handler.h" +#include "cef/include/cef_request.h" +#include "cef/include/cef_resource_handler.h" namespace net_service { diff --git a/libcef/browser/net_service/resource_request_handler_wrapper.cc b/libcef/browser/net_service/resource_request_handler_wrapper.cc index bc823f6ea..4c292d87e 100644 --- a/libcef/browser/net_service/resource_request_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_request_handler_wrapper.cc @@ -2,25 +2,24 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/net_service/resource_request_handler_wrapper.h" +#include "cef/libcef/browser/net_service/resource_request_handler_wrapper.h" #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/context.h" -#include "libcef/browser/iothread_state.h" -#include "libcef/browser/net_service/cookie_helper.h" -#include "libcef/browser/net_service/proxy_url_loader_factory.h" -#include "libcef/browser/net_service/resource_handler_wrapper.h" -#include "libcef/browser/net_service/response_filter_wrapper.h" -#include "libcef/browser/prefs/browser_prefs.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/net/scheme_registration.h" -#include "libcef/common/net_service/net_service_util.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/response_impl.h" - +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/iothread_state.h" +#include "cef/libcef/browser/net_service/cookie_helper.h" +#include "cef/libcef/browser/net_service/proxy_url_loader_factory.h" +#include "cef/libcef/browser/net_service/resource_handler_wrapper.h" +#include "cef/libcef/browser/net_service/response_filter_wrapper.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/net/scheme_registration.h" +#include "cef/libcef/common/net_service/net_service_util.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/response_impl.h" #include "chrome/browser/profiles/profile.h" #include "components/language/core/browser/pref_names.h" #include "components/prefs/pref_service.h" diff --git a/libcef/browser/net_service/response_filter_wrapper.cc b/libcef/browser/net_service/response_filter_wrapper.cc index 11cf2f272..5f953dd37 100644 --- a/libcef/browser/net_service/response_filter_wrapper.cc +++ b/libcef/browser/net_service/response_filter_wrapper.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/net_service/response_filter_wrapper.h" +#include "cef/libcef/browser/net_service/response_filter_wrapper.h" #include diff --git a/libcef/browser/net_service/response_filter_wrapper.h b/libcef/browser/net_service/response_filter_wrapper.h index a85d09596..8c1b35f66 100644 --- a/libcef/browser/net_service/response_filter_wrapper.h +++ b/libcef/browser/net_service/response_filter_wrapper.h @@ -5,9 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_NET_SERVICE_RESPONSE_FILTER_WRAPPER_H_ #define CEF_LIBCEF_BROWSER_NET_SERVICE_RESPONSE_FILTER_WRAPPER_H_ -#include "include/cef_response_filter.h" - #include "base/functional/callback_forward.h" +#include "cef/include/cef_response_filter.h" #include "mojo/public/cpp/system/data_pipe.h" namespace net_service { diff --git a/libcef/browser/net_service/stream_reader_url_loader.cc b/libcef/browser/net_service/stream_reader_url_loader.cc index 353058008..8c2afb1cd 100644 --- a/libcef/browser/net_service/stream_reader_url_loader.cc +++ b/libcef/browser/net_service/stream_reader_url_loader.cc @@ -3,10 +3,7 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#include "libcef/browser/net_service/stream_reader_url_loader.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/common/net_service/net_service_util.h" +#include "cef/libcef/browser/net_service/stream_reader_url_loader.h" #include "base/functional/bind.h" #include "base/functional/callback.h" @@ -16,6 +13,8 @@ #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/http/http_status_code.h" diff --git a/libcef/browser/net_service/url_loader_factory_getter.cc b/libcef/browser/net_service/url_loader_factory_getter.cc index 8f0cabed3..4999abc52 100644 --- a/libcef/browser/net_service/url_loader_factory_getter.cc +++ b/libcef/browser/net_service/url_loader_factory_getter.cc @@ -3,12 +3,11 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#include "libcef/browser/net_service/url_loader_factory_getter.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" +#include "cef/libcef/browser/net_service/url_loader_factory_getter.h" #include "base/task/single_thread_task_runner.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" #include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/browser_context.h" diff --git a/libcef/browser/origin_whitelist_impl.cc b/libcef/browser/origin_whitelist_impl.cc index a6738e66b..2b90dcd67 100644 --- a/libcef/browser/origin_whitelist_impl.cc +++ b/libcef/browser/origin_whitelist_impl.cc @@ -2,19 +2,18 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/origin_whitelist_impl.h" +#include "cef/libcef/browser/origin_whitelist_impl.h" #include #include -#include "include/cef_origin_whitelist.h" -#include "libcef/browser/browser_manager.h" -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" - #include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/synchronization/lock.h" +#include "cef/include/cef_origin_whitelist.h" +#include "cef/libcef/browser/browser_manager.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/thread_util.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "chrome/common/webui_url_constants.h" #include "content/public/browser/render_process_host.h" diff --git a/libcef/browser/osr/browser_platform_delegate_osr.cc b/libcef/browser/osr/browser_platform_delegate_osr.cc index 1c9508229..11368aa44 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr.cc +++ b/libcef/browser/osr/browser_platform_delegate_osr.cc @@ -2,19 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/browser_platform_delegate_osr.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr.h" #include -#include "libcef/browser/image_impl.h" -#include "libcef/browser/osr/osr_accessibility_util.h" -#include "libcef/browser/osr/render_widget_host_view_osr.h" -#include "libcef/browser/osr/touch_selection_controller_client_osr.h" -#include "libcef/browser/osr/web_contents_view_osr.h" -#include "libcef/browser/views/view_util.h" -#include "libcef/common/drag_data_impl.h" - #include "base/task/current_thread.h" +#include "cef/libcef/browser/image_impl.h" +#include "cef/libcef/browser/osr/osr_accessibility_util.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" +#include "cef/libcef/browser/osr/touch_selection_controller_client_osr.h" +#include "cef/libcef/browser/osr/web_contents_view_osr.h" +#include "cef/libcef/browser/views/view_util.h" +#include "cef/libcef/common/drag_data_impl.h" #include "content/browser/renderer_host/render_widget_host_input_event_router.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/render_view_host.h" diff --git a/libcef/browser/osr/browser_platform_delegate_osr.h b/libcef/browser/osr/browser_platform_delegate_osr.h index cd183b5a4..6ceffde6f 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr.h +++ b/libcef/browser/osr/browser_platform_delegate_osr.h @@ -5,8 +5,8 @@ #ifndef CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_H_ #define CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_H_ -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" -#include "libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" class CefRenderWidgetHostViewOSR; class CefWebContentsViewOSR; diff --git a/libcef/browser/osr/browser_platform_delegate_osr_linux.cc b/libcef/browser/osr/browser_platform_delegate_osr_linux.cc index 062984453..223f6044a 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_linux.cc +++ b/libcef/browser/osr/browser_platform_delegate_osr_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/browser_platform_delegate_osr_linux.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_linux.h" #include diff --git a/libcef/browser/osr/browser_platform_delegate_osr_linux.h b/libcef/browser/osr/browser_platform_delegate_osr_linux.h index 93f03ba83..f61b1e044 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_linux.h +++ b/libcef/browser/osr/browser_platform_delegate_osr_linux.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_LINUX_H_ #define CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_LINUX_H_ -#include "libcef/browser/osr/browser_platform_delegate_osr.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr.h" // Windowless browser implementation for Linux. class CefBrowserPlatformDelegateOsrLinux diff --git a/libcef/browser/osr/browser_platform_delegate_osr_mac.h b/libcef/browser/osr/browser_platform_delegate_osr_mac.h index 43ed36aa2..fe0305241 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_mac.h +++ b/libcef/browser/osr/browser_platform_delegate_osr_mac.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_MAC_H_ #define CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_MAC_H_ -#include "libcef/browser/osr/browser_platform_delegate_osr.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr.h" // Windowless browser implementation for Mac OS X. class CefBrowserPlatformDelegateOsrMac : public CefBrowserPlatformDelegateOsr { diff --git a/libcef/browser/osr/browser_platform_delegate_osr_mac.mm b/libcef/browser/osr/browser_platform_delegate_osr_mac.mm index aebb71d6f..877863857 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_mac.mm +++ b/libcef/browser/osr/browser_platform_delegate_osr_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/browser_platform_delegate_osr_mac.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_mac.h" #include diff --git a/libcef/browser/osr/browser_platform_delegate_osr_win.cc b/libcef/browser/osr/browser_platform_delegate_osr_win.cc index 9307bac57..3289aa6de 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_win.cc +++ b/libcef/browser/osr/browser_platform_delegate_osr_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/browser_platform_delegate_osr_win.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr_win.h" #include diff --git a/libcef/browser/osr/browser_platform_delegate_osr_win.h b/libcef/browser/osr/browser_platform_delegate_osr_win.h index 8c07a1530..d4ddcb765 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr_win.h +++ b/libcef/browser/osr/browser_platform_delegate_osr_win.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_WIN_H_ #define CEF_LIBCEF_BROWSER_OSR_BROWSER_PLATFORM_DELEGATE_OSR_WIN_H_ -#include "libcef/browser/osr/browser_platform_delegate_osr.h" +#include "cef/libcef/browser/osr/browser_platform_delegate_osr.h" // Windowless browser implementation for Windows. class CefBrowserPlatformDelegateOsrWin : public CefBrowserPlatformDelegateOsr { diff --git a/libcef/browser/osr/host_display_client_osr.cc b/libcef/browser/osr/host_display_client_osr.cc index a26c4103b..e9212a19b 100644 --- a/libcef/browser/osr/host_display_client_osr.cc +++ b/libcef/browser/osr/host_display_client_osr.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/host_display_client_osr.h" +#include "cef/libcef/browser/osr/host_display_client_osr.h" #include -#include "libcef/browser/osr/render_widget_host_view_osr.h" - #include "base/memory/shared_memory_mapping.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" #include "components/viz/common/resources/resource_sizes.h" #include "mojo/public/cpp/system/platform_handle.h" #include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h" diff --git a/libcef/browser/osr/motion_event_osr.cc b/libcef/browser/osr/motion_event_osr.cc index e7132bae2..cf50178d5 100644 --- a/libcef/browser/osr/motion_event_osr.cc +++ b/libcef/browser/osr/motion_event_osr.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/motion_event_osr.h" +#include "cef/libcef/browser/osr/motion_event_osr.h" #include diff --git a/libcef/browser/osr/motion_event_osr.h b/libcef/browser/osr/motion_event_osr.h index 63887bfeb..d7fd36105 100644 --- a/libcef/browser/osr/motion_event_osr.h +++ b/libcef/browser/osr/motion_event_osr.h @@ -7,8 +7,7 @@ #define CEF_LIBCEF_BROWSER_OSR_MOTION_EVENT_OSR_H_ #pragma once -#include "include/cef_base.h" - +#include "cef/include/cef_base.h" #include "third_party/blink/public/common/input/web_touch_event.h" #include "ui/events/velocity_tracker/motion_event_generic.h" diff --git a/libcef/browser/osr/osr_accessibility_util.cc b/libcef/browser/osr/osr_accessibility_util.cc index f023abc7c..926cfdaf8 100644 --- a/libcef/browser/osr/osr_accessibility_util.cc +++ b/libcef/browser/osr/osr_accessibility_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/osr/osr_accessibility_util.h" +#include "cef/libcef/browser/osr/osr_accessibility_util.h" #include #include diff --git a/libcef/browser/osr/osr_accessibility_util.h b/libcef/browser/osr/osr_accessibility_util.h index 486c91aae..634fe2118 100644 --- a/libcef/browser/osr/osr_accessibility_util.h +++ b/libcef/browser/osr/osr_accessibility_util.h @@ -7,7 +7,8 @@ #pragma once #include -#include "include/cef_values.h" + +#include "cef/include/cef_values.h" namespace content { struct AXEventNotificationDetails; diff --git a/libcef/browser/osr/osr_util.cc b/libcef/browser/osr/osr_util.cc index d1069b692..6a51a6506 100644 --- a/libcef/browser/osr/osr_util.cc +++ b/libcef/browser/osr/osr_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/osr_util.h" +#include "cef/libcef/browser/osr/osr_util.h" namespace osr_util { diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc index a672d14f2..4f1997363 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.cc +++ b/libcef/browser/osr/render_widget_host_view_osr.cc @@ -3,24 +3,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/render_widget_host_view_osr.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" #include + #include #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/osr/osr_util.h" -#include "libcef/browser/osr/synthetic_gesture_target_osr.h" -#include "libcef/browser/osr/touch_selection_controller_client_osr.h" -#include "libcef/browser/osr/video_consumer_osr.h" -#include "libcef/browser/thread_util.h" - #include "base/command_line.h" #include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "cc/base/switches.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/osr/osr_util.h" +#include "cef/libcef/browser/osr/synthetic_gesture_target_osr.h" +#include "cef/libcef/browser/osr/touch_selection_controller_client_osr.h" +#include "cef/libcef/browser/osr/video_consumer_osr.h" +#include "cef/libcef/browser/thread_util.h" #include "components/viz/common/features.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "components/viz/common/frame_sinks/copy_output_request.h" diff --git a/libcef/browser/osr/render_widget_host_view_osr.h b/libcef/browser/osr/render_widget_host_view_osr.h index b94875219..a8660d637 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.h +++ b/libcef/browser/osr/render_widget_host_view_osr.h @@ -11,16 +11,14 @@ #include #include -#include "include/cef_base.h" -#include "include/cef_browser.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/osr/host_display_client_osr.h" -#include "libcef/browser/osr/motion_event_osr.h" - #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "cc/layers/deadline_policy.h" +#include "cef/include/cef_base.h" +#include "cef/include/cef_browser.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/osr/host_display_client_osr.h" +#include "cef/libcef/browser/osr/motion_event_osr.h" #include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h" #include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h" diff --git a/libcef/browser/osr/software_output_device_proxy.cc b/libcef/browser/osr/software_output_device_proxy.cc index c4d229919..24f7f6e6f 100644 --- a/libcef/browser/osr/software_output_device_proxy.cc +++ b/libcef/browser/osr/software_output_device_proxy.cc @@ -15,6 +15,7 @@ #if BUILDFLAG(IS_WIN) #include + #include "skia/ext/skia_utils_win.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/libcef/browser/osr/software_output_device_proxy.h b/libcef/browser/osr/software_output_device_proxy.h index fc29ae2e1..81cbaddf6 100644 --- a/libcef/browser/osr/software_output_device_proxy.h +++ b/libcef/browser/osr/software_output_device_proxy.h @@ -53,4 +53,4 @@ class VIZ_SERVICE_EXPORT SoftwareOutputDeviceProxy } // namespace viz -#endif // CEF_LIBCEF_BROWSER_OSR_SOFTWARE_OUTPUT_DEVICE_PROXY_H_ \ No newline at end of file +#endif // CEF_LIBCEF_BROWSER_OSR_SOFTWARE_OUTPUT_DEVICE_PROXY_H_ diff --git a/libcef/browser/osr/synthetic_gesture_target_osr.cc b/libcef/browser/osr/synthetic_gesture_target_osr.cc index 1648d5344..c28e24643 100644 --- a/libcef/browser/osr/synthetic_gesture_target_osr.cc +++ b/libcef/browser/osr/synthetic_gesture_target_osr.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/osr/synthetic_gesture_target_osr.h" +#include "cef/libcef/browser/osr/synthetic_gesture_target_osr.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "ui/events/gesture_detection/gesture_configuration.h" diff --git a/libcef/browser/osr/touch_handle_drawable_osr.cc b/libcef/browser/osr/touch_handle_drawable_osr.cc index 96b0e8d52..e8ce6154f 100644 --- a/libcef/browser/osr/touch_handle_drawable_osr.cc +++ b/libcef/browser/osr/touch_handle_drawable_osr.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/touch_handle_drawable_osr.h" +#include "cef/libcef/browser/osr/touch_handle_drawable_osr.h" #include -#include "libcef/browser/osr/render_widget_host_view_osr.h" - +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/size.h" diff --git a/libcef/browser/osr/touch_handle_drawable_osr.h b/libcef/browser/osr/touch_handle_drawable_osr.h index 4de5c2654..2586c575b 100644 --- a/libcef/browser/osr/touch_handle_drawable_osr.h +++ b/libcef/browser/osr/touch_handle_drawable_osr.h @@ -6,9 +6,8 @@ #ifndef CEF_LIBCEF_BROWSER_OSR_TOUCH_HANDLE_DRAWABLE_OSR_H_ #define CEF_LIBCEF_BROWSER_OSR_TOUCH_HANDLE_DRAWABLE_OSR_H_ -#include "include/internal/cef_types_wrappers.h" - #include "base/memory/raw_ptr.h" +#include "cef/include/internal/cef_types_wrappers.h" #include "ui/gfx/native_widget_types.h" #include "ui/touch_selection/touch_handle.h" #include "ui/touch_selection/touch_handle_orientation.h" diff --git a/libcef/browser/osr/touch_selection_controller_client_osr.cc b/libcef/browser/osr/touch_selection_controller_client_osr.cc index 7206c0ba4..97e7acd3b 100644 --- a/libcef/browser/osr/touch_selection_controller_client_osr.cc +++ b/libcef/browser/osr/touch_selection_controller_client_osr.cc @@ -3,15 +3,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/touch_selection_controller_client_osr.h" +#include "cef/libcef/browser/osr/touch_selection_controller_client_osr.h" #include #include -#include "libcef/browser/osr/render_widget_host_view_osr.h" -#include "libcef/browser/osr/touch_handle_drawable_osr.h" - #include "base/functional/bind.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" +#include "cef/libcef/browser/osr/touch_handle_drawable_osr.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/public/browser/context_menu_params.h" diff --git a/libcef/browser/osr/video_consumer_osr.cc b/libcef/browser/osr/video_consumer_osr.cc index dc7e745c0..64c4d90a7 100644 --- a/libcef/browser/osr/video_consumer_osr.cc +++ b/libcef/browser/osr/video_consumer_osr.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#include "libcef/browser/osr/video_consumer_osr.h" - -#include "libcef/browser/osr/render_widget_host_view_osr.h" +#include "cef/libcef/browser/osr/video_consumer_osr.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" #include "media/base/video_frame_metadata.h" #include "media/capture/mojom/video_capture_buffer.mojom.h" #include "media/capture/mojom/video_capture_types.mojom.h" diff --git a/libcef/browser/osr/web_contents_view_osr.cc b/libcef/browser/osr/web_contents_view_osr.cc index 48612a50d..c0b8c8b62 100644 --- a/libcef/browser/osr/web_contents_view_osr.cc +++ b/libcef/browser/osr/web_contents_view_osr.cc @@ -3,13 +3,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/osr/web_contents_view_osr.h" - -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/osr/render_widget_host_view_osr.h" -#include "libcef/browser/osr/touch_selection_controller_client_osr.h" -#include "libcef/common/drag_data_impl.h" +#include "cef/libcef/browser/osr/web_contents_view_osr.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/osr/render_widget_host_view_osr.h" +#include "cef/libcef/browser/osr/touch_selection_controller_client_osr.h" +#include "cef/libcef/common/drag_data_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/render_widget_host.h" diff --git a/libcef/browser/path_util_impl.cc b/libcef/browser/path_util_impl.cc index 0d26a46f8..f9956714e 100644 --- a/libcef/browser/path_util_impl.cc +++ b/libcef/browser/path_util_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_path_util.h" - #include "base/files/file_path.h" #include "base/logging.h" #include "base/notreached.h" #include "base/path_service.h" +#include "cef/include/cef_path_util.h" #include "chrome/common/chrome_paths.h" bool CefGetPath(PathKey key, CefString& path) { diff --git a/libcef/browser/permission_prompt.cc b/libcef/browser/permission_prompt.cc index c2dbdbea9..c78230045 100644 --- a/libcef/browser/permission_prompt.cc +++ b/libcef/browser/permission_prompt.cc @@ -2,14 +2,13 @@ // 2016 The Chromium 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 "libcef/browser/permission_prompt.h" - -#include "libcef/browser/browser_host_base.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/browser/permission_prompt.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/ui/permission_bubble/permission_prompt.h" namespace permission_prompt { diff --git a/libcef/browser/prefs/browser_prefs.cc b/libcef/browser/prefs/browser_prefs.cc index 7589a990c..62cfde97e 100644 --- a/libcef/browser/prefs/browser_prefs.cc +++ b/libcef/browser/prefs/browser_prefs.cc @@ -2,28 +2,26 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/prefs/browser_prefs.h" - -#include "libcef/browser/browser_context.h" -#include "libcef/browser/context.h" -#include "libcef/browser/prefs/pref_registrar.h" +#include "cef/libcef/browser/prefs/browser_prefs.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/prefs/pref_registrar.h" #include "chrome/browser/profiles/profile.h" #include "components/language/core/browser/pref_names.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/media_capture_devices_dispatcher.h" -#include "libcef/browser/prefs/pref_store.h" -#include "libcef/browser/prefs/renderer_prefs.h" -#include "libcef/common/cef_switches.h" - #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "base/task/thread_pool.h" #include "base/values.h" +#include "cef/libcef/browser/media_capture_devices_dispatcher.h" +#include "cef/libcef/browser/prefs/pref_store.h" +#include "cef/libcef/browser/prefs/renderer_prefs.h" +#include "cef/libcef/common/cef_switches.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/media/router/discovery/access_code/access_code_cast_feature.h" #include "chrome/browser/media/router/media_router_feature.h" diff --git a/libcef/browser/prefs/pref_helper.cc b/libcef/browser/prefs/pref_helper.cc index 99aa693e1..146b0a1cc 100644 --- a/libcef/browser/prefs/pref_helper.cc +++ b/libcef/browser/prefs/pref_helper.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/prefs/pref_helper.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/common/values_impl.h" +#include "cef/libcef/browser/prefs/pref_helper.h" #include "base/notreached.h" #include "base/strings/stringprintf.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/values_impl.h" #include "components/prefs/pref_service.h" namespace pref_helper { diff --git a/libcef/browser/prefs/pref_helper.h b/libcef/browser/prefs/pref_helper.h index 8c85208a4..d8ac2a5a4 100644 --- a/libcef/browser/prefs/pref_helper.h +++ b/libcef/browser/prefs/pref_helper.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_PREFS_PREF_HELPER_H_ #define CEF_LIBCEF_BROWSER_PREFS_PREF_HELPER_H_ -#include "include/cef_values.h" +#include "cef/include/cef_values.h" class PrefService; diff --git a/libcef/browser/prefs/pref_registrar.cc b/libcef/browser/prefs/pref_registrar.cc index 4e1b09dae..680bdf8b1 100644 --- a/libcef/browser/prefs/pref_registrar.cc +++ b/libcef/browser/prefs/pref_registrar.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/prefs/pref_registrar.h" - -#include "include/cef_app.h" -#include "include/cef_browser_process_handler.h" -#include "include/cef_preference.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/values_impl.h" +#include "cef/libcef/browser/prefs/pref_registrar.h" +#include "cef/include/cef_app.h" +#include "cef/include/cef_browser_process_handler.h" +#include "cef/include/cef_preference.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/values_impl.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_store.h" diff --git a/libcef/browser/prefs/pref_registrar.h b/libcef/browser/prefs/pref_registrar.h index b6edcf448..f2ed35cb6 100644 --- a/libcef/browser/prefs/pref_registrar.h +++ b/libcef/browser/prefs/pref_registrar.h @@ -5,7 +5,7 @@ #ifndef CEF_LIBCEF_BROWSER_PREFS_PREF_REGISTRAR_H_ #define CEF_LIBCEF_BROWSER_PREFS_PREF_REGISTRAR_H_ -#include "include/internal/cef_types.h" +#include "cef/include/internal/cef_types.h" class PrefRegistrySimple; diff --git a/libcef/browser/prefs/pref_store.cc b/libcef/browser/prefs/pref_store.cc index 35d00b684..d4b8bcbfa 100644 --- a/libcef/browser/prefs/pref_store.cc +++ b/libcef/browser/prefs/pref_store.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/prefs/pref_store.h" +#include "cef/libcef/browser/prefs/pref_store.h" #include #include diff --git a/libcef/browser/prefs/renderer_prefs.cc b/libcef/browser/prefs/renderer_prefs.cc index 65d86c270..2afb05975 100644 --- a/libcef/browser/prefs/renderer_prefs.cc +++ b/libcef/browser/prefs/renderer_prefs.cc @@ -2,23 +2,21 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/prefs/renderer_prefs.h" - -#include "libcef/common/cef_switches.h" +#include "cef/libcef/browser/prefs/renderer_prefs.h" #include "base/command_line.h" +#include "cef/libcef/common/cef_switches.h" #include "content/public/common/content_switches.h" #include "third_party/blink/public/common/web_preferences/web_preferences.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/context.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/features/runtime_checks.h" - #include "base/i18n/character_encoding.h" #include "base/memory/ptr_util.h" #include "base/values.h" +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/features/runtime_checks.h" #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_webkit_preferences.h" diff --git a/libcef/browser/prefs/renderer_prefs.h b/libcef/browser/prefs/renderer_prefs.h index d07d6e583..c540d4ede 100644 --- a/libcef/browser/prefs/renderer_prefs.h +++ b/libcef/browser/prefs/renderer_prefs.h @@ -8,8 +8,7 @@ #include -#include "include/internal/cef_types_wrappers.h" - +#include "cef/include/internal/cef_types_wrappers.h" #include "cef/libcef/features/features.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) diff --git a/libcef/browser/print_settings_impl.cc b/libcef/browser/print_settings_impl.cc index 8a8dda7f1..3505b9263 100644 --- a/libcef/browser/print_settings_impl.cc +++ b/libcef/browser/print_settings_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/print_settings_impl.h" +#include "cef/libcef/browser/print_settings_impl.h" #include "base/logging.h" - #include "printing/mojom/print.mojom.h" CefPrintSettingsImpl::CefPrintSettingsImpl( diff --git a/libcef/browser/print_settings_impl.h b/libcef/browser/print_settings_impl.h index 2bc356b8e..0744d67dc 100644 --- a/libcef/browser/print_settings_impl.h +++ b/libcef/browser/print_settings_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_PRINT_SETTINGS_IMPL_H_ #pragma once -#include "include/cef_print_settings.h" -#include "libcef/common/value_base.h" - +#include "cef/include/cef_print_settings.h" +#include "cef/libcef/common/value_base.h" #include "printing/print_settings.h" // CefPrintSettings implementation diff --git a/libcef/browser/printing/print_dialog_linux.cc b/libcef/browser/printing/print_dialog_linux.cc index 68e4a1e38..420050514 100644 --- a/libcef/browser/printing/print_dialog_linux.cc +++ b/libcef/browser/printing/print_dialog_linux.cc @@ -3,23 +3,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/printing/print_dialog_linux.h" +#include "cef/libcef/browser/printing/print_dialog_linux.h" #include #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/print_settings_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/frame_util.h" - #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/print_settings_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/frame_util.h" #include "content/public/browser/global_routing_id.h" #include "printing/metafile.h" #include "printing/mojom/print.mojom-shared.h" diff --git a/libcef/browser/printing/print_dialog_linux.h b/libcef/browser/printing/print_dialog_linux.h index 5cf71edc3..62206a353 100644 --- a/libcef/browser/printing/print_dialog_linux.h +++ b/libcef/browser/printing/print_dialog_linux.h @@ -6,12 +6,11 @@ #ifndef LIBCEF_BROWSER_PRINTING_PRINT_DIALOG_LINUX_H_ #define LIBCEF_BROWSER_PRINTING_PRINT_DIALOG_LINUX_H_ -#include "include/cef_print_handler.h" -#include "libcef/browser/browser_host_base.h" - #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner_helpers.h" +#include "cef/include/cef_print_handler.h" +#include "cef/libcef/browser/browser_host_base.h" #include "content/public/browser/browser_thread.h" #include "printing/buildflags/buildflags.h" #include "printing/print_dialog_linux_interface.h" diff --git a/libcef/browser/printing/print_util.cc b/libcef/browser/printing/print_util.cc index 4f91db993..0980f43de 100644 --- a/libcef/browser/printing/print_util.cc +++ b/libcef/browser/printing/print_util.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/printing/print_util.h" - -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/printing/print_util.h" #include "base/files/file_util.h" +#include "cef/libcef/browser/thread_util.h" #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/printing/print_view_manager_common.h" #include "components/printing/browser/print_to_pdf/pdf_print_utils.h" diff --git a/libcef/browser/printing/print_util.h b/libcef/browser/printing/print_util.h index fe12ec545..6c0970589 100644 --- a/libcef/browser/printing/print_util.h +++ b/libcef/browser/printing/print_util.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_PRINTING_PRINT_UTIL_H_ #pragma once -#include "include/cef_browser.h" +#include "cef/include/cef_browser.h" namespace content { class WebContents; diff --git a/libcef/browser/process_util_impl.cc b/libcef/browser/process_util_impl.cc index 6e09c00fd..16e6d6de5 100644 --- a/libcef/browser/process_util_impl.cc +++ b/libcef/browser/process_util_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_process_util.h" -#include "libcef/common/command_line_impl.h" - #include "base/logging.h" #include "base/notreached.h" #include "base/process/launch.h" +#include "cef/include/cef_process_util.h" +#include "cef/libcef/common/command_line_impl.h" #include "content/public/browser/child_process_launcher_utils.h" bool CefLaunchProcess(CefRefPtr command_line) { diff --git a/libcef/browser/request_context_handler_map.cc b/libcef/browser/request_context_handler_map.cc index eca2290e0..057c8b1f0 100644 --- a/libcef/browser/request_context_handler_map.cc +++ b/libcef/browser/request_context_handler_map.cc @@ -2,9 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/request_context_handler_map.h" +#include "cef/libcef/browser/request_context_handler_map.h" -#include "libcef/common/frame_util.h" +#include "cef/libcef/common/frame_util.h" CefRequestContextHandlerMap::CefRequestContextHandlerMap() = default; CefRequestContextHandlerMap::~CefRequestContextHandlerMap() = default; diff --git a/libcef/browser/request_context_handler_map.h b/libcef/browser/request_context_handler_map.h index 8f2422dce..646f86386 100644 --- a/libcef/browser/request_context_handler_map.h +++ b/libcef/browser/request_context_handler_map.h @@ -8,9 +8,8 @@ #include -#include "include/cef_request_context.h" -#include "include/cef_request_context_handler.h" - +#include "cef/include/cef_request_context.h" +#include "cef/include/cef_request_context_handler.h" #include "content/public/browser/global_routing_id.h" // Tracks CefRequestContextHandler associations on a single thread. diff --git a/libcef/browser/request_context_impl.cc b/libcef/browser/request_context_impl.cc index 7726d6d95..9e7cdb079 100644 --- a/libcef/browser/request_context_impl.cc +++ b/libcef/browser/request_context_impl.cc @@ -2,18 +2,18 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/context.h" -#include "libcef/browser/prefs/pref_helper.h" -#include "libcef/browser/thread_util.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/task_runner_impl.h" -#include "libcef/common/values_impl.h" +#include "cef/libcef/browser/request_context_impl.h" #include "base/atomic_sequence_num.h" #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/prefs/pref_helper.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/task_runner_impl.h" +#include "cef/libcef/common/values_impl.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" diff --git a/libcef/browser/request_context_impl.h b/libcef/browser/request_context_impl.h index 9890fb8a1..d72aec22b 100644 --- a/libcef/browser/request_context_impl.h +++ b/libcef/browser/request_context_impl.h @@ -6,11 +6,11 @@ #define CEF_LIBCEF_BROWSER_REQUEST_CONTEXT_IMPL_H_ #pragma once -#include "include/cef_request_context.h" -#include "libcef/browser/browser_context.h" -#include "libcef/browser/media_router/media_router_impl.h" -#include "libcef/browser/net_service/cookie_manager_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/include/cef_request_context.h" +#include "cef/libcef/browser/browser_context.h" +#include "cef/libcef/browser/media_router/media_router_impl.h" +#include "cef/libcef/browser/net_service/cookie_manager_impl.h" +#include "cef/libcef/browser/thread_util.h" namespace content { struct GlobalRenderFrameHostId; diff --git a/libcef/browser/scheme_impl.cc b/libcef/browser/scheme_impl.cc index 3ac0c95e9..ca4419cb3 100644 --- a/libcef/browser/scheme_impl.cc +++ b/libcef/browser/scheme_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_scheme.h" -#include "libcef/browser/context.h" - #include "base/logging.h" +#include "cef/include/cef_scheme.h" +#include "cef/libcef/browser/context.h" bool CefRegisterSchemeHandlerFactory( const CefString& scheme_name, diff --git a/libcef/browser/server_impl.cc b/libcef/browser/server_impl.cc index cc57d7481..0bcf537c6 100644 --- a/libcef/browser/server_impl.cc +++ b/libcef/browser/server_impl.cc @@ -2,20 +2,19 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/server_impl.h" +#include "cef/libcef/browser/server_impl.h" #include -#include "libcef/browser/thread_util.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/task_runner_impl.h" - #include "base/format_macros.h" #include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/task_runner_impl.h" #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" #include "net/server/http_server_request_info.h" diff --git a/libcef/browser/server_impl.h b/libcef/browser/server_impl.h index 57ab34d69..f48295dee 100644 --- a/libcef/browser/server_impl.h +++ b/libcef/browser/server_impl.h @@ -9,9 +9,8 @@ #include #include -#include "include/cef_server.h" - #include "base/task/single_thread_task_runner.h" +#include "cef/include/cef_server.h" #include "net/server/http_server.h" namespace base { diff --git a/libcef/browser/simple_menu_model_impl.cc b/libcef/browser/simple_menu_model_impl.cc index a75546de2..8c7d74016 100644 --- a/libcef/browser/simple_menu_model_impl.cc +++ b/libcef/browser/simple_menu_model_impl.cc @@ -3,12 +3,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/simple_menu_model_impl.h" +#include "cef/libcef/browser/simple_menu_model_impl.h" #include -#include "libcef/browser/thread_util.h" -#include "libcef/common/task_runner_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/task_runner_impl.h" namespace { diff --git a/libcef/browser/simple_menu_model_impl.h b/libcef/browser/simple_menu_model_impl.h index 4a9ec3c5a..96059f1bc 100644 --- a/libcef/browser/simple_menu_model_impl.h +++ b/libcef/browser/simple_menu_model_impl.h @@ -10,9 +10,8 @@ #include #include -#include "include/cef_menu_model.h" - #include "base/threading/platform_thread.h" +#include "cef/include/cef_menu_model.h" #include "ui/base/models/simple_menu_model.h" // Implementation of CefMenuModel that wraps an existing ui::SimpleMenuModel. diff --git a/libcef/browser/speech_recognition_manager_delegate.cc b/libcef/browser/speech_recognition_manager_delegate.cc index 3e6244d92..48647b5ec 100644 --- a/libcef/browser/speech_recognition_manager_delegate.cc +++ b/libcef/browser/speech_recognition_manager_delegate.cc @@ -2,16 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/speech_recognition_manager_delegate.h" +#include "cef/libcef/browser/speech_recognition_manager_delegate.h" #include #include -#include "libcef/browser/thread_util.h" -#include "libcef/common/cef_switches.h" - #include "base/command_line.h" #include "base/functional/bind.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/common/cef_switches.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/libcef/browser/ssl_host_state_delegate.cc b/libcef/browser/ssl_host_state_delegate.cc index a7aec8419..343435c50 100644 --- a/libcef/browser/ssl_host_state_delegate.cc +++ b/libcef/browser/ssl_host_state_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/ssl_host_state_delegate.h" +#include "cef/libcef/browser/ssl_host_state_delegate.h" #include "base/functional/callback.h" #include "net/base/hash_value.h" diff --git a/libcef/browser/ssl_info_impl.cc b/libcef/browser/ssl_info_impl.cc index ca406cd3a..b5592210f 100644 --- a/libcef/browser/ssl_info_impl.cc +++ b/libcef/browser/ssl_info_impl.cc @@ -2,9 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/ssl_info_impl.h" -#include "libcef/browser/x509_certificate_impl.h" +#include "cef/libcef/browser/ssl_info_impl.h" +#include "cef/libcef/browser/x509_certificate_impl.h" #include "net/cert/cert_status_flags.h" CefSSLInfoImpl::CefSSLInfoImpl(const net::SSLInfo& value) { diff --git a/libcef/browser/ssl_info_impl.h b/libcef/browser/ssl_info_impl.h index 62d410e58..325dc1b7c 100644 --- a/libcef/browser/ssl_info_impl.h +++ b/libcef/browser/ssl_info_impl.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_SSL_INFO_IMPL_H_ #pragma once -#include "include/cef_ssl_info.h" - +#include "cef/include/cef_ssl_info.h" #include "net/ssl/ssl_info.h" // CefSSLInfo implementation diff --git a/libcef/browser/ssl_status_impl.cc b/libcef/browser/ssl_status_impl.cc index f119bfaf9..b3101650e 100644 --- a/libcef/browser/ssl_status_impl.cc +++ b/libcef/browser/ssl_status_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/ssl_status_impl.h" - -#include "libcef/browser/x509_certificate_impl.h" +#include "cef/libcef/browser/ssl_status_impl.h" +#include "cef/libcef/browser/x509_certificate_impl.h" #include "net/ssl/ssl_connection_status_flags.h" CefSSLStatusImpl::CefSSLStatusImpl(const content::SSLStatus& value) { diff --git a/libcef/browser/ssl_status_impl.h b/libcef/browser/ssl_status_impl.h index 43ef322e6..64dfedbce 100644 --- a/libcef/browser/ssl_status_impl.h +++ b/libcef/browser/ssl_status_impl.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_SSL_STATUS_IMPL_H_ #pragma once -#include "include/cef_ssl_status.h" - +#include "cef/include/cef_ssl_status.h" #include "content/public/browser/ssl_status.h" // CefSSLStatus implementation diff --git a/libcef/browser/stream_impl.cc b/libcef/browser/stream_impl.cc index cf6d31e3d..c8d1b0673 100644 --- a/libcef/browser/stream_impl.cc +++ b/libcef/browser/stream_impl.cc @@ -2,8 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/stream_impl.h" +#include "cef/libcef/browser/stream_impl.h" + #include + #include "base/files/file_util.h" #include "base/logging.h" #include "base/threading/thread_restrictions.h" diff --git a/libcef/browser/stream_impl.h b/libcef/browser/stream_impl.h index 880ceec82..4f3ce97e5 100644 --- a/libcef/browser/stream_impl.h +++ b/libcef/browser/stream_impl.h @@ -6,12 +6,12 @@ #define CEF_LIBCEF_BROWSER_STREAM_IMPL_H_ #pragma once -#include "include/cef_stream.h" - #include + #include #include "base/synchronization/lock.h" +#include "cef/include/cef_stream.h" // Implementation of CefStreamReader for files. class CefFileReader : public CefStreamReader { diff --git a/libcef/browser/test/test_helpers_impl.cc b/libcef/browser/test/test_helpers_impl.cc index 1e0ea9c10..6dbec2dab 100644 --- a/libcef/browser/test/test_helpers_impl.cc +++ b/libcef/browser/test/test_helpers_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/test/cef_test_helpers.h" - #include "base/files/file_path.h" #include "base/path_service.h" +#include "cef/include/test/cef_test_helpers.h" void CefSetDataDirectoryForTests(const CefString& dir) { base::PathService::OverrideAndCreateIfNeeded( diff --git a/libcef/browser/test/test_server_impl.cc b/libcef/browser/test/test_server_impl.cc index a0c1396af..29cbc56ee 100644 --- a/libcef/browser/test/test_server_impl.cc +++ b/libcef/browser/test/test_server_impl.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/test/test_server_impl.h" - -#include "libcef/common/net/http_header_utils.h" +#include "cef/libcef/browser/test/test_server_impl.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "cef/libcef/common/net/http_header_utils.h" #include "net/http/http_request_headers.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/libcef/browser/test/test_server_impl.h b/libcef/browser/test/test_server_impl.h index 353860109..e72db82c7 100644 --- a/libcef/browser/test/test_server_impl.h +++ b/libcef/browser/test/test_server_impl.h @@ -8,7 +8,7 @@ #include -#include "include/test/cef_test_server.h" +#include "cef/include/test/cef_test_server.h" class CefTestServerImpl : public CefTestServer { public: diff --git a/libcef/browser/trace_impl.cc b/libcef/browser/trace_impl.cc index 105710413..3c06f5289 100644 --- a/libcef/browser/trace_impl.cc +++ b/libcef/browser/trace_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_trace.h" -#include "libcef/browser/context.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/trace_subscriber.h" - #include "base/time/time.h" +#include "cef/include/cef_trace.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/trace_subscriber.h" bool CefBeginTracing(const CefString& categories, CefRefPtr callback) { diff --git a/libcef/browser/trace_subscriber.cc b/libcef/browser/trace_subscriber.cc index 24e381b59..6712f2a49 100644 --- a/libcef/browser/trace_subscriber.cc +++ b/libcef/browser/trace_subscriber.cc @@ -2,13 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/browser/trace_subscriber.h" -#include "include/cef_trace.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/trace_subscriber.h" #include "base/files/file_util.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" +#include "cef/include/cef_trace.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/tracing_controller.h" namespace { diff --git a/libcef/browser/trace_subscriber.h b/libcef/browser/trace_subscriber.h index 01d279104..699391863 100644 --- a/libcef/browser/trace_subscriber.h +++ b/libcef/browser/trace_subscriber.h @@ -6,11 +6,10 @@ #define CEF_LIBCEF_BROWSER_TRACE_SUBSCRIBER_H_ #pragma once -#include "include/cef_trace.h" - #include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" +#include "cef/include/cef_trace.h" // May only be accessed on the browser process UI thread. class CefTraceSubscriber { diff --git a/libcef/browser/views/basic_label_button_impl.cc b/libcef/browser/views/basic_label_button_impl.cc index 41ae1fe3b..902c01510 100644 --- a/libcef/browser/views/basic_label_button_impl.cc +++ b/libcef/browser/views/basic_label_button_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/basic_label_button_impl.h" +#include "cef/libcef/browser/views/basic_label_button_impl.h" -#include "libcef/browser/views/basic_label_button_view.h" +#include "cef/libcef/browser/views/basic_label_button_view.h" // static CefRefPtr CefLabelButton::CreateLabelButton( diff --git a/libcef/browser/views/basic_label_button_impl.h b/libcef/browser/views/basic_label_button_impl.h index 8621c71c6..a182fbaba 100644 --- a/libcef/browser/views/basic_label_button_impl.h +++ b/libcef/browser/views/basic_label_button_impl.h @@ -6,11 +6,9 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BASIC_LABEL_BUTTON_IMPL_H_ #pragma once -#include "include/views/cef_button_delegate.h" -#include "include/views/cef_label_button.h" - -#include "libcef/browser/views/label_button_impl.h" - +#include "cef/include/views/cef_button_delegate.h" +#include "cef/include/views/cef_label_button.h" +#include "cef/libcef/browser/views/label_button_impl.h" #include "ui/views/controls/button/label_button.h" class CefBasicLabelButtonImpl : public CefLabelButtonImpl CefPanel::CreatePanel( diff --git a/libcef/browser/views/basic_panel_impl.h b/libcef/browser/views/basic_panel_impl.h index 06ffb7ee4..7dc1ea24a 100644 --- a/libcef/browser/views/basic_panel_impl.h +++ b/libcef/browser/views/basic_panel_impl.h @@ -6,11 +6,9 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BASIC_PANEL_IMPL_H_ #pragma once -#include "include/views/cef_panel.h" -#include "include/views/cef_panel_delegate.h" - -#include "libcef/browser/views/panel_impl.h" - +#include "cef/include/views/cef_panel.h" +#include "cef/include/views/cef_panel_delegate.h" +#include "cef/libcef/browser/views/panel_impl.h" #include "ui/views/view.h" class CefBasicPanelImpl diff --git a/libcef/browser/views/basic_panel_view.cc b/libcef/browser/views/basic_panel_view.cc index 7df66a368..554badae0 100644 --- a/libcef/browser/views/basic_panel_view.cc +++ b/libcef/browser/views/basic_panel_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/basic_panel_view.h" +#include "cef/libcef/browser/views/basic_panel_view.h" CefBasicPanelView::CefBasicPanelView(CefPanelDelegate* cef_delegate) : ParentClass(cef_delegate) {} diff --git a/libcef/browser/views/basic_panel_view.h b/libcef/browser/views/basic_panel_view.h index 659b7cb18..2bb440ce0 100644 --- a/libcef/browser/views/basic_panel_view.h +++ b/libcef/browser/views/basic_panel_view.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BASIC_PANEL_VIEW_H_ #pragma once -#include "include/views/cef_panel_delegate.h" - -#include "libcef/browser/views/panel_view.h" +#include "cef/include/views/cef_panel_delegate.h" +#include "cef/libcef/browser/views/panel_view.h" class CefBasicPanelView : public CefPanelView { public: diff --git a/libcef/browser/views/box_layout_impl.cc b/libcef/browser/views/box_layout_impl.cc index 0305ef826..e82151d81 100644 --- a/libcef/browser/views/box_layout_impl.cc +++ b/libcef/browser/views/box_layout_impl.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/box_layout_impl.h" +#include "cef/libcef/browser/views/box_layout_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/view_util.h" // static CefRefPtr CefBoxLayoutImpl::Create( diff --git a/libcef/browser/views/box_layout_impl.h b/libcef/browser/views/box_layout_impl.h index a6ae5f1ce..61e9002de 100644 --- a/libcef/browser/views/box_layout_impl.h +++ b/libcef/browser/views/box_layout_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BOX_LAYOUT_IMPL_H_ #pragma once -#include "include/views/cef_box_layout.h" - -#include "libcef/browser/views/layout_impl.h" +#include "cef/include/views/cef_box_layout.h" +#include "cef/libcef/browser/views/layout_impl.h" #include "ui/views/layout/box_layout.h" class CefBoxLayoutImpl : public CefLayoutImpl { diff --git a/libcef/browser/views/browser_platform_delegate_views.cc b/libcef/browser/views/browser_platform_delegate_views.cc index c551d4566..c6b2bc89a 100644 --- a/libcef/browser/views/browser_platform_delegate_views.cc +++ b/libcef/browser/views/browser_platform_delegate_views.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/browser/views/browser_platform_delegate_views.h" +#include "cef/libcef/browser/views/browser_platform_delegate_views.h" #include -#include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/browser/views/menu_runner_views.h" - +#include "cef/libcef/browser/alloy/alloy_browser_host_impl.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/menu_runner_views.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" #include "ui/views/widget/widget.h" diff --git a/libcef/browser/views/browser_platform_delegate_views.h b/libcef/browser/views/browser_platform_delegate_views.h index 4711c912b..c85210fcd 100644 --- a/libcef/browser/views/browser_platform_delegate_views.h +++ b/libcef/browser/views/browser_platform_delegate_views.h @@ -5,9 +5,9 @@ #ifndef CEF_LIBCEF_BROWSER_VIEWS_BROWSER_PLATFORM_DELEGATE_VIEWS_H_ #define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_PLATFORM_DELEGATE_VIEWS_H_ -#include "libcef/browser/alloy/browser_platform_delegate_alloy.h" -#include "libcef/browser/native/browser_platform_delegate_native.h" -#include "libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/alloy/browser_platform_delegate_alloy.h" +#include "cef/libcef/browser/native/browser_platform_delegate_native.h" +#include "cef/libcef/browser/views/browser_view_impl.h" // Implementation of Views-based browser functionality. class CefBrowserPlatformDelegateViews diff --git a/libcef/browser/views/browser_view_impl.cc b/libcef/browser/views/browser_view_impl.cc index 3b960e555..3f973a3e7 100644 --- a/libcef/browser/views/browser_view_impl.cc +++ b/libcef/browser/views/browser_view_impl.cc @@ -2,21 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/browser_view_impl.h" #include #include -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/browser_util.h" -#include "libcef/browser/chrome/views/chrome_browser_view.h" -#include "libcef/browser/context.h" -#include "libcef/browser/request_context_impl.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/widget.h" -#include "libcef/browser/views/window_impl.h" -#include "libcef/features/runtime.h" - +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/browser_util.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_view.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/browser/request_context_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/widget.h" +#include "cef/libcef/browser/views/window_impl.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/profiles/profile.h" #include "content/public/common/input/native_web_keyboard_event.h" #include "ui/content_accelerators/accelerator_util.h" diff --git a/libcef/browser/views/browser_view_impl.h b/libcef/browser/views/browser_view_impl.h index 183cb57be..7bdcecc05 100644 --- a/libcef/browser/views/browser_view_impl.h +++ b/libcef/browser/views/browser_view_impl.h @@ -6,15 +6,14 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_IMPL_H_ #pragma once -#include "include/cef_client.h" -#include "include/views/cef_browser_view.h" -#include "include/views/cef_browser_view_delegate.h" -#include "libcef/browser/browser_host_base.h" -#include "libcef/browser/views/browser_view_view.h" -#include "libcef/browser/views/view_impl.h" - #include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" +#include "cef/include/cef_client.h" +#include "cef/include/views/cef_browser_view.h" +#include "cef/include/views/cef_browser_view_delegate.h" +#include "cef/libcef/browser/browser_host_base.h" +#include "cef/libcef/browser/views/browser_view_view.h" +#include "cef/libcef/browser/views/view_impl.h" #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" class CefBrowserHostBase; diff --git a/libcef/browser/views/browser_view_view.cc b/libcef/browser/views/browser_view_view.cc index 9e251281f..babaf9572 100644 --- a/libcef/browser/views/browser_view_view.cc +++ b/libcef/browser/views/browser_view_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/browser_view_view.h" +#include "cef/libcef/browser/views/browser_view_view.h" -#include "libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/browser_view_impl.h" CefBrowserViewView::CefBrowserViewView(CefBrowserViewDelegate* cef_delegate, Delegate* browser_view_delegate) diff --git a/libcef/browser/views/browser_view_view.h b/libcef/browser/views/browser_view_view.h index aaf3d7aa5..abc1d5c0e 100644 --- a/libcef/browser/views/browser_view_view.h +++ b/libcef/browser/views/browser_view_view.h @@ -6,10 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_VIEW_H_ #pragma once -#include "include/views/cef_browser_view_delegate.h" - -#include "libcef/browser/views/view_view.h" - +#include "cef/include/views/cef_browser_view_delegate.h" +#include "cef/libcef/browser/views/view_view.h" #include "ui/views/controls/webview/webview.h" // Extend views::WebView with a no-argument constructor as required by the diff --git a/libcef/browser/views/button_impl.h b/libcef/browser/views/button_impl.h index db6ab50cd..b21c03a4a 100644 --- a/libcef/browser/views/button_impl.h +++ b/libcef/browser/views/button_impl.h @@ -6,12 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BUTTON_IMPL_H_ #pragma once -#include "include/views/cef_button.h" -#include "include/views/cef_label_button.h" - -#include "libcef/browser/views/view_impl.h" - #include "base/logging.h" +#include "cef/include/views/cef_button.h" +#include "cef/include/views/cef_label_button.h" +#include "cef/libcef/browser/views/view_impl.h" #include "ui/gfx/color_utils.h" #include "ui/views/animation/ink_drop.h" #include "ui/views/controls/button/button.h" diff --git a/libcef/browser/views/button_view.h b/libcef/browser/views/button_view.h index 1504860ce..f400cb310 100644 --- a/libcef/browser/views/button_view.h +++ b/libcef/browser/views/button_view.h @@ -6,12 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_BUTTON_VIEW_H_ #pragma once -#include "include/views/cef_button_delegate.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/view_view.h" - #include "base/logging.h" +#include "cef/include/views/cef_button_delegate.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/view_view.h" #include "ui/gfx/color_utils.h" #include "ui/views/animation/ink_drop.h" #include "ui/views/controls/button/button.h" diff --git a/libcef/browser/views/color_provider_tracker.cc b/libcef/browser/views/color_provider_tracker.cc index 720e379ef..2c7ff5e56 100644 --- a/libcef/browser/views/color_provider_tracker.cc +++ b/libcef/browser/views/color_provider_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/color_provider_tracker.h" +#include "cef/libcef/browser/views/color_provider_tracker.h" #include "base/check.h" diff --git a/libcef/browser/views/display_impl.cc b/libcef/browser/views/display_impl.cc index e6262718e..3d026d873 100644 --- a/libcef/browser/views/display_impl.cc +++ b/libcef/browser/views/display_impl.cc @@ -2,10 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/views/display_impl.h" - -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/display_impl.h" +#include "cef/libcef/browser/views/view_util.h" #include "ui/display/screen.h" // static diff --git a/libcef/browser/views/display_impl.h b/libcef/browser/views/display_impl.h index 984e5803c..4db34a2c2 100644 --- a/libcef/browser/views/display_impl.h +++ b/libcef/browser/views/display_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_DISPLAY_IMPL_H_ #pragma once -#include "include/views/cef_display.h" -#include "libcef/browser/thread_util.h" - +#include "cef/include/views/cef_display.h" +#include "cef/libcef/browser/thread_util.h" #include "ui/display/display.h" class CefDisplayImpl : public CefDisplay { diff --git a/libcef/browser/views/fill_layout_impl.cc b/libcef/browser/views/fill_layout_impl.cc index 1ed452b8a..f28869b04 100644 --- a/libcef/browser/views/fill_layout_impl.cc +++ b/libcef/browser/views/fill_layout_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/fill_layout_impl.h" +#include "cef/libcef/browser/views/fill_layout_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/thread_util.h" // static CefRefPtr CefFillLayoutImpl::Create(views::View* owner_view) { diff --git a/libcef/browser/views/fill_layout_impl.h b/libcef/browser/views/fill_layout_impl.h index f0757677d..faa7ae94a 100644 --- a/libcef/browser/views/fill_layout_impl.h +++ b/libcef/browser/views/fill_layout_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_FILL_LAYOUT_IMPL_H_ #pragma once -#include "include/views/cef_fill_layout.h" - -#include "libcef/browser/views/layout_impl.h" +#include "cef/include/views/cef_fill_layout.h" +#include "cef/libcef/browser/views/layout_impl.h" #include "ui/views/layout/fill_layout.h" class CefFillLayoutImpl diff --git a/libcef/browser/views/label_button_impl.h b/libcef/browser/views/label_button_impl.h index 511232e7c..b0b930794 100644 --- a/libcef/browser/views/label_button_impl.h +++ b/libcef/browser/views/label_button_impl.h @@ -6,14 +6,12 @@ #define CEF_LIBCEF_BROWSER_VIEWS_LABEL_BUTTON_IMPL_H_ #pragma once -#include "include/views/cef_button.h" -#include "include/views/cef_label_button.h" -#include "include/views/cef_menu_button.h" - -#include "libcef/browser/image_impl.h" -#include "libcef/browser/views/button_impl.h" - #include "base/logging.h" +#include "cef/include/views/cef_button.h" +#include "cef/include/views/cef_label_button.h" +#include "cef/include/views/cef_menu_button.h" +#include "cef/libcef/browser/image_impl.h" +#include "cef/libcef/browser/views/button_impl.h" #include "ui/views/controls/button/label_button.h" // Helpers for template boiler-plate. diff --git a/libcef/browser/views/label_button_view.h b/libcef/browser/views/label_button_view.h index a628dfd8b..ae97f3b54 100644 --- a/libcef/browser/views/label_button_view.h +++ b/libcef/browser/views/label_button_view.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_BROWSER_VIEWS_LABEL_BUTTON_VIEW_H_ #pragma once -#include "include/views/cef_label_button.h" -#include "libcef/browser/views/button_view.h" - #include "base/logging.h" +#include "cef/include/views/cef_label_button.h" +#include "cef/libcef/browser/views/button_view.h" #include "ui/gfx/font_list.h" // Helpers for template boiler-plate. diff --git a/libcef/browser/views/layout_adapter.cc b/libcef/browser/views/layout_adapter.cc index 6d4cc6ab1..87ecba380 100644 --- a/libcef/browser/views/layout_adapter.cc +++ b/libcef/browser/views/layout_adapter.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/layout_adapter.h" +#include "cef/libcef/browser/views/layout_adapter.h" -#include "libcef/browser/views/box_layout_impl.h" -#include "libcef/browser/views/fill_layout_impl.h" +#include "cef/libcef/browser/views/box_layout_impl.h" +#include "cef/libcef/browser/views/fill_layout_impl.h" // static CefLayoutAdapter* CefLayoutAdapter::GetFor(CefRefPtr layout) { diff --git a/libcef/browser/views/layout_adapter.h b/libcef/browser/views/layout_adapter.h index ef479deaf..e4a5be9fb 100644 --- a/libcef/browser/views/layout_adapter.h +++ b/libcef/browser/views/layout_adapter.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_BROWSER_VIEWS_LAYOUT_ADAPTER_H_ #pragma once -#include "include/views/cef_layout.h" +#include "cef/include/views/cef_layout.h" namespace views { class LayoutManager; diff --git a/libcef/browser/views/layout_impl.h b/libcef/browser/views/layout_impl.h index d2f2cd6ca..8b241a5fc 100644 --- a/libcef/browser/views/layout_impl.h +++ b/libcef/browser/views/layout_impl.h @@ -6,15 +6,13 @@ #define CEF_LIBCEF_BROWSER_VIEWS_LAYOUT_IMPL_H_ #pragma once -#include "include/views/cef_box_layout.h" -#include "include/views/cef_fill_layout.h" -#include "include/views/cef_layout.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/layout_adapter.h" -#include "libcef/browser/views/layout_util.h" - #include "base/logging.h" +#include "cef/include/views/cef_box_layout.h" +#include "cef/include/views/cef_fill_layout.h" +#include "cef/include/views/cef_layout.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/layout_adapter.h" +#include "cef/libcef/browser/views/layout_util.h" #include "ui/views/layout/layout_manager.h" #include "ui/views/view.h" diff --git a/libcef/browser/views/layout_util.cc b/libcef/browser/views/layout_util.cc index 1d5602edb..712cfa963 100644 --- a/libcef/browser/views/layout_util.cc +++ b/libcef/browser/views/layout_util.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/layout_util.h" +#include "cef/libcef/browser/views/layout_util.h" #include -#include "libcef/browser/views/layout_adapter.h" - +#include "cef/libcef/browser/views/layout_adapter.h" #include "ui/views/view.h" namespace layout_util { diff --git a/libcef/browser/views/layout_util.h b/libcef/browser/views/layout_util.h index bd0555ebc..ef7fec1d6 100644 --- a/libcef/browser/views/layout_util.h +++ b/libcef/browser/views/layout_util.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_VIEWS_LAYOUT_UTIL_H_ #pragma once -#include "include/views/cef_layout.h" - +#include "cef/include/views/cef_layout.h" #include "ui/views/layout/layout_manager.h" namespace views { diff --git a/libcef/browser/views/menu_button_impl.cc b/libcef/browser/views/menu_button_impl.cc index d74d2cf68..e76edd85e 100644 --- a/libcef/browser/views/menu_button_impl.cc +++ b/libcef/browser/views/menu_button_impl.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/menu_button_impl.h" - -#include "libcef/browser/views/menu_button_view.h" -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/views/menu_button_impl.h" +#include "cef/libcef/browser/views/menu_button_view.h" +#include "cef/libcef/browser/views/window_impl.h" #include "ui/gfx/canvas.h" // static diff --git a/libcef/browser/views/menu_button_impl.h b/libcef/browser/views/menu_button_impl.h index 26bb14ff9..80d1aa7f4 100644 --- a/libcef/browser/views/menu_button_impl.h +++ b/libcef/browser/views/menu_button_impl.h @@ -6,12 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_MENU_BUTTON_IMPL_H_ #pragma once -#include "include/views/cef_menu_button.h" -#include "include/views/cef_menu_button_delegate.h" - -#include "libcef/browser/menu_model_impl.h" -#include "libcef/browser/views/label_button_impl.h" - +#include "cef/include/views/cef_menu_button.h" +#include "cef/include/views/cef_menu_button_delegate.h" +#include "cef/libcef/browser/menu_model_impl.h" +#include "cef/libcef/browser/views/label_button_impl.h" #include "ui/views/controls/button/menu_button.h" class CefMenuButtonImpl : public CefLabelButtonImpl -#include "include/views/cef_overlay_controller.h" -#include "include/views/cef_view.h" - +#include "cef/include/views/cef_overlay_controller.h" +#include "cef/include/views/cef_view.h" #include "ui/views/view_observer.h" #include "ui/views/widget/unique_widget_ptr.h" #include "ui/views/widget/widget_delegate.h" diff --git a/libcef/browser/views/panel_impl.h b/libcef/browser/views/panel_impl.h index a12e8f1de..dd49d7c4e 100644 --- a/libcef/browser/views/panel_impl.h +++ b/libcef/browser/views/panel_impl.h @@ -6,17 +6,15 @@ #define CEF_LIBCEF_BROWSER_VIEWS_PANEL_IMPL_H_ #pragma once -#include "include/views/cef_fill_layout.h" -#include "include/views/cef_layout.h" -#include "include/views/cef_panel.h" -#include "include/views/cef_window.h" - -#include "libcef/browser/views/box_layout_impl.h" -#include "libcef/browser/views/fill_layout_impl.h" -#include "libcef/browser/views/layout_util.h" -#include "libcef/browser/views/view_impl.h" - #include "base/logging.h" +#include "cef/include/views/cef_fill_layout.h" +#include "cef/include/views/cef_layout.h" +#include "cef/include/views/cef_panel.h" +#include "cef/include/views/cef_window.h" +#include "cef/libcef/browser/views/box_layout_impl.h" +#include "cef/libcef/browser/views/fill_layout_impl.h" +#include "cef/libcef/browser/views/layout_util.h" +#include "cef/libcef/browser/views/view_impl.h" // Helpers for template boiler-plate. #define CEF_PANEL_IMPL_T CEF_VIEW_IMPL_T diff --git a/libcef/browser/views/panel_view.h b/libcef/browser/views/panel_view.h index ef6d0e229..ade13d79c 100644 --- a/libcef/browser/views/panel_view.h +++ b/libcef/browser/views/panel_view.h @@ -6,12 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_PANEL_VIEW_H_ #pragma once -#include "include/views/cef_panel_delegate.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/view_view.h" - #include "base/logging.h" +#include "cef/include/views/cef_panel_delegate.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/view_view.h" // Helpers for template boiler-plate. #define CEF_PANEL_VIEW_T CEF_VIEW_VIEW_T diff --git a/libcef/browser/views/scroll_view_impl.cc b/libcef/browser/views/scroll_view_impl.cc index 946f1e4dd..4c23904dc 100644 --- a/libcef/browser/views/scroll_view_impl.cc +++ b/libcef/browser/views/scroll_view_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/scroll_view_impl.h" +#include "cef/libcef/browser/views/scroll_view_impl.h" // static CefRefPtr CefScrollView::CreateScrollView( diff --git a/libcef/browser/views/scroll_view_impl.h b/libcef/browser/views/scroll_view_impl.h index 38cb9badc..346ed1c0a 100644 --- a/libcef/browser/views/scroll_view_impl.h +++ b/libcef/browser/views/scroll_view_impl.h @@ -6,11 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_SCROLL_VIEW_IMPL_H_ #pragma once -#include "include/views/cef_scroll_view.h" -#include "include/views/cef_view_delegate.h" - -#include "libcef/browser/views/scroll_view_view.h" -#include "libcef/browser/views/view_impl.h" +#include "cef/include/views/cef_scroll_view.h" +#include "cef/include/views/cef_view_delegate.h" +#include "cef/libcef/browser/views/scroll_view_view.h" +#include "cef/libcef/browser/views/view_impl.h" class CefScrollViewImpl : public CefViewImpl { diff --git a/libcef/browser/views/scroll_view_view.cc b/libcef/browser/views/scroll_view_view.cc index 39ac25cc0..dfc2c3c7b 100644 --- a/libcef/browser/views/scroll_view_view.cc +++ b/libcef/browser/views/scroll_view_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/scroll_view_view.h" +#include "cef/libcef/browser/views/scroll_view_view.h" CefScrollViewView::CefScrollViewView(CefViewDelegate* cef_delegate) : ParentClass(cef_delegate) {} diff --git a/libcef/browser/views/scroll_view_view.h b/libcef/browser/views/scroll_view_view.h index 89d7e5d57..b32d59c4b 100644 --- a/libcef/browser/views/scroll_view_view.h +++ b/libcef/browser/views/scroll_view_view.h @@ -6,10 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_SCROLL_VIEW_VIEW_H_ #pragma once -#include "include/views/cef_panel_delegate.h" - -#include "libcef/browser/views/view_view.h" - +#include "cef/include/views/cef_panel_delegate.h" +#include "cef/libcef/browser/views/view_view.h" #include "ui/views/controls/scroll_view.h" class CefScrollViewView diff --git a/libcef/browser/views/textfield_impl.cc b/libcef/browser/views/textfield_impl.cc index f1afd97df..0ec773012 100644 --- a/libcef/browser/views/textfield_impl.cc +++ b/libcef/browser/views/textfield_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/textfield_impl.h" +#include "cef/libcef/browser/views/textfield_impl.h" -#include "libcef/browser/thread_util.h" +#include "cef/libcef/browser/thread_util.h" namespace { static int CefCommandIdToChromeId(cef_text_field_commands_t command_id) { diff --git a/libcef/browser/views/textfield_impl.h b/libcef/browser/views/textfield_impl.h index 8a5ac406e..2bdc3c016 100644 --- a/libcef/browser/views/textfield_impl.h +++ b/libcef/browser/views/textfield_impl.h @@ -6,11 +6,10 @@ #define CEF_LIBCEF_BROWSER_VIEWS_TEXTFIELD_IMPL_H_ #pragma once -#include "include/views/cef_textfield.h" -#include "include/views/cef_textfield_delegate.h" - -#include "libcef/browser/views/textfield_view.h" -#include "libcef/browser/views/view_impl.h" +#include "cef/include/views/cef_textfield.h" +#include "cef/include/views/cef_textfield_delegate.h" +#include "cef/libcef/browser/views/textfield_view.h" +#include "cef/libcef/browser/views/view_impl.h" class CefTextfieldImpl : public CefViewImpl { diff --git a/libcef/browser/views/textfield_view.cc b/libcef/browser/views/textfield_view.cc index 103d108ae..ee7a26df6 100644 --- a/libcef/browser/views/textfield_view.cc +++ b/libcef/browser/views/textfield_view.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/textfield_view.h" +#include "cef/libcef/browser/views/textfield_view.h" -#include "libcef/browser/browser_util.h" +#include "cef/libcef/browser/browser_util.h" CefTextfieldView::CefTextfieldView(CefTextfieldDelegate* cef_delegate) : ParentClass(cef_delegate) { diff --git a/libcef/browser/views/textfield_view.h b/libcef/browser/views/textfield_view.h index f4e4f5ee4..c3dd3c812 100644 --- a/libcef/browser/views/textfield_view.h +++ b/libcef/browser/views/textfield_view.h @@ -6,11 +6,9 @@ #define CEF_LIBCEF_BROWSER_VIEWS_TEXTFIELD_VIEW_H_ #pragma once -#include "include/views/cef_textfield_delegate.h" - -#include "include/views/cef_textfield.h" -#include "libcef/browser/views/view_view.h" - +#include "cef/include/views/cef_textfield.h" +#include "cef/include/views/cef_textfield_delegate.h" +#include "cef/libcef/browser/views/view_view.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield_controller.h" diff --git a/libcef/browser/views/view_adapter.cc b/libcef/browser/views/view_adapter.cc index 5c3257380..2b523e984 100644 --- a/libcef/browser/views/view_adapter.cc +++ b/libcef/browser/views/view_adapter.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/view_adapter.h" +#include "cef/libcef/browser/views/view_adapter.h" -#include "libcef/browser/chrome/views/toolbar_view_impl.h" -#include "libcef/browser/views/basic_label_button_impl.h" -#include "libcef/browser/views/basic_panel_impl.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/browser/views/menu_button_impl.h" -#include "libcef/browser/views/scroll_view_impl.h" -#include "libcef/browser/views/textfield_impl.h" -#include "libcef/browser/views/view_util.h" -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/chrome/views/toolbar_view_impl.h" +#include "cef/libcef/browser/views/basic_label_button_impl.h" +#include "cef/libcef/browser/views/basic_panel_impl.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/menu_button_impl.h" +#include "cef/libcef/browser/views/scroll_view_impl.h" +#include "cef/libcef/browser/views/textfield_impl.h" +#include "cef/libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/window_impl.h" // static CefViewAdapter* CefViewAdapter::GetFor(CefRefPtr view) { diff --git a/libcef/browser/views/view_adapter.h b/libcef/browser/views/view_adapter.h index 2bdb7354d..1c01d63cb 100644 --- a/libcef/browser/views/view_adapter.h +++ b/libcef/browser/views/view_adapter.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_BROWSER_VIEWS_VIEW_ADAPTER_H_ #pragma once -#include "include/views/cef_view.h" - #include "base/values.h" +#include "cef/include/views/cef_view.h" namespace views { class View; diff --git a/libcef/browser/views/view_impl.h b/libcef/browser/views/view_impl.h index c13d57b76..e38907e68 100644 --- a/libcef/browser/views/view_impl.h +++ b/libcef/browser/views/view_impl.h @@ -284,20 +284,18 @@ // * Build CEF using Ninja. // -#include "include/views/cef_browser_view.h" -#include "include/views/cef_button.h" -#include "include/views/cef_panel.h" -#include "include/views/cef_scroll_view.h" -#include "include/views/cef_textfield.h" -#include "include/views/cef_view.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/view_adapter.h" -#include "libcef/browser/views/view_util.h" - #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" +#include "cef/include/views/cef_browser_view.h" +#include "cef/include/views/cef_button.h" +#include "cef/include/views/cef_panel.h" +#include "cef/include/views/cef_scroll_view.h" +#include "cef/include/views/cef_textfield.h" +#include "cef/include/views/cef_view.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/view_adapter.h" +#include "cef/libcef/browser/views/view_util.h" #include "ui/gfx/color_palette.h" #include "ui/views/accessibility/view_accessibility.h" #include "ui/views/background.h" diff --git a/libcef/browser/views/view_util.cc b/libcef/browser/views/view_util.cc index bdf543e38..3ca11c44c 100644 --- a/libcef/browser/views/view_util.cc +++ b/libcef/browser/views/view_util.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/view_util.h" #include -#include "include/cef_color_ids.h" -#include "libcef/browser/views/view_adapter.h" -#include "libcef/browser/views/widget.h" - +#include "cef/include/cef_color_ids.h" +#include "cef/libcef/browser/views/view_adapter.h" +#include "cef/libcef/browser/views/widget.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/color/chrome_color_id.h" diff --git a/libcef/browser/views/view_util.h b/libcef/browser/views/view_util.h index 0985070db..c83814ecf 100644 --- a/libcef/browser/views/view_util.h +++ b/libcef/browser/views/view_util.h @@ -8,9 +8,8 @@ #include -#include "include/views/cef_view.h" -#include "include/views/cef_window.h" - +#include "cef/include/views/cef_view.h" +#include "cef/include/views/cef_window.h" #include "ui/color/color_id.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/view.h" diff --git a/libcef/browser/views/view_util_aura.cc b/libcef/browser/views/view_util_aura.cc index d5b7baa52..a0c358212 100644 --- a/libcef/browser/views/view_util_aura.cc +++ b/libcef/browser/views/view_util_aura.cc @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/view_util.h" - +#include "cef/libcef/browser/views/view_util.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/views/view_constants_aura.h" diff --git a/libcef/browser/views/view_util_mac.mm b/libcef/browser/views/view_util_mac.mm index cedadeb63..92de7d176 100644 --- a/libcef/browser/views/view_util_mac.mm +++ b/libcef/browser/views/view_util_mac.mm @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/view_util.h" #import -#include "include/internal/cef_types_mac.h" -#include "libcef/browser/views/native_widget_mac.h" - +#include "cef/include/internal/cef_types_mac.h" +#include "cef/libcef/browser/views/native_widget_mac.h" #include "ui/views/widget/widget.h" namespace view_util { diff --git a/libcef/browser/views/view_view.h b/libcef/browser/views/view_view.h index c51a41a6d..f66fa42dc 100644 --- a/libcef/browser/views/view_view.h +++ b/libcef/browser/views/view_view.h @@ -6,13 +6,11 @@ #define CEF_LIBCEF_BROWSER_VIEWS_VIEW_VIEW_H_ #pragma once -#include "include/views/cef_view.h" -#include "include/views/cef_view_delegate.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/view_util.h" - #include "base/logging.h" +#include "cef/include/views/cef_view.h" +#include "cef/include/views/cef_view_delegate.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/view_util.h" #include "ui/views/accessibility/accessibility_paint_checks.h" #include "ui/views/background.h" #include "ui/views/view.h" diff --git a/libcef/browser/views/widget.cc b/libcef/browser/views/widget.cc index 6ef6d4929..3e075dd74 100644 --- a/libcef/browser/views/widget.cc +++ b/libcef/browser/views/widget.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/widget.h" +#include "cef/libcef/browser/views/widget.h" -#include "libcef/browser/chrome/views/chrome_browser_frame.h" -#include "libcef/browser/views/view_util.h" -#include "libcef/browser/views/widget_impl.h" -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/chrome/views/chrome_browser_frame.h" +#include "cef/libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/widget_impl.h" +#include "cef/libcef/browser/views/window_impl.h" // static CefWidget* CefWidget::Create(CefWindowView* window_view) { diff --git a/libcef/browser/views/widget_impl.cc b/libcef/browser/views/widget_impl.cc index f8c1620a8..1a2c96a1e 100644 --- a/libcef/browser/views/widget_impl.cc +++ b/libcef/browser/views/widget_impl.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/widget_impl.h" - -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/window_view.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/browser/views/widget_impl.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/window_view.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/themes/custom_theme_supplier.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/libcef/browser/views/widget_impl.h b/libcef/browser/views/widget_impl.h index ae92dc9a0..180d0258b 100644 --- a/libcef/browser/views/widget_impl.h +++ b/libcef/browser/views/widget_impl.h @@ -8,10 +8,9 @@ #include -#include "libcef/browser/views/color_provider_tracker.h" -#include "libcef/browser/views/widget.h" - #include "base/memory/weak_ptr.h" +#include "cef/libcef/browser/views/color_provider_tracker.h" +#include "cef/libcef/browser/views/widget.h" #include "chrome/browser/themes/theme_service_observer.h" #include "ui/views/widget/widget.h" diff --git a/libcef/browser/views/window_impl.cc b/libcef/browser/views/window_impl.cc index 3cc560512..a6529eb1b 100644 --- a/libcef/browser/views/window_impl.cc +++ b/libcef/browser/views/window_impl.cc @@ -2,21 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/window_impl.h" +#include "cef/libcef/browser/views/window_impl.h" #include -#include "libcef/browser/browser_util.h" -#include "libcef/browser/thread_util.h" -#include "libcef/browser/views/browser_view_impl.h" -#include "libcef/browser/views/display_impl.h" -#include "libcef/browser/views/fill_layout_impl.h" -#include "libcef/browser/views/layout_util.h" -#include "libcef/browser/views/view_util.h" -#include "libcef/browser/views/widget.h" -#include "libcef/browser/views/window_view.h" - #include "base/i18n/rtl.h" +#include "cef/libcef/browser/browser_util.h" +#include "cef/libcef/browser/thread_util.h" +#include "cef/libcef/browser/views/browser_view_impl.h" +#include "cef/libcef/browser/views/display_impl.h" +#include "cef/libcef/browser/views/fill_layout_impl.h" +#include "cef/libcef/browser/views/layout_util.h" +#include "cef/libcef/browser/views/view_util.h" +#include "cef/libcef/browser/views/widget.h" +#include "cef/libcef/browser/views/window_view.h" #include "components/constrained_window/constrained_window_views.h" #include "ui/base/test/ui_controls.h" #include "ui/compositor/compositor.h" diff --git a/libcef/browser/views/window_impl.h b/libcef/browser/views/window_impl.h index 4dff08f9f..5558770ff 100644 --- a/libcef/browser/views/window_impl.h +++ b/libcef/browser/views/window_impl.h @@ -8,13 +8,11 @@ #include -#include "include/views/cef_window.h" -#include "include/views/cef_window_delegate.h" - -#include "libcef/browser/menu_model_impl.h" -#include "libcef/browser/views/panel_impl.h" -#include "libcef/browser/views/window_view.h" - +#include "cef/include/views/cef_window.h" +#include "cef/include/views/cef_window_delegate.h" +#include "cef/libcef/browser/menu_model_impl.h" +#include "cef/libcef/browser/views/panel_impl.h" +#include "cef/libcef/browser/views/window_view.h" #include "ui/base/accelerators/accelerator.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/widget.h" diff --git a/libcef/browser/views/window_view.cc b/libcef/browser/views/window_view.cc index c01e102f9..6767c1d00 100644 --- a/libcef/browser/views/window_view.cc +++ b/libcef/browser/views/window_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/browser/views/window_view.h" +#include "cef/libcef/browser/views/window_view.h" #include @@ -14,13 +14,12 @@ #endif #endif -#include "libcef/browser/geometry_util.h" -#include "libcef/browser/image_impl.h" -#include "libcef/browser/views/widget.h" -#include "libcef/browser/views/window_impl.h" -#include "libcef/features/runtime.h" - #include "base/ranges/algorithm.h" +#include "cef/libcef/browser/geometry_util.h" +#include "cef/libcef/browser/image_impl.h" +#include "cef/libcef/browser/views/widget.h" +#include "cef/libcef/browser/views/window_impl.h" +#include "cef/libcef/features/runtime.h" #include "ui/base/hit_test.h" #include "ui/display/screen.h" #include "ui/views/widget/widget.h" diff --git a/libcef/browser/views/window_view.h b/libcef/browser/views/window_view.h index 5865d64e8..a0337217e 100644 --- a/libcef/browser/views/window_view.h +++ b/libcef/browser/views/window_view.h @@ -9,13 +9,11 @@ #include #include -#include "include/views/cef_window.h" -#include "include/views/cef_window_delegate.h" - -#include "libcef/browser/views/overlay_view_host.h" -#include "libcef/browser/views/panel_view.h" -#include "libcef/browser/views/widget_destruction_observer.h" - +#include "cef/include/views/cef_window.h" +#include "cef/include/views/cef_window_delegate.h" +#include "cef/libcef/browser/views/overlay_view_host.h" +#include "cef/libcef/browser/views/panel_view.h" +#include "cef/libcef/browser/views/widget_destruction_observer.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/display/display.h" #include "ui/views/widget/widget_delegate.h" diff --git a/libcef/browser/x509_cert_principal_impl.cc b/libcef/browser/x509_cert_principal_impl.cc index d315fdda1..1f454c139 100644 --- a/libcef/browser/x509_cert_principal_impl.cc +++ b/libcef/browser/x509_cert_principal_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/x509_cert_principal_impl.h" +#include "cef/libcef/browser/x509_cert_principal_impl.h" namespace { diff --git a/libcef/browser/x509_cert_principal_impl.h b/libcef/browser/x509_cert_principal_impl.h index 9c065d554..e199d6184 100644 --- a/libcef/browser/x509_cert_principal_impl.h +++ b/libcef/browser/x509_cert_principal_impl.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_BROWSER_X509_CERT_PRINCIPAL_IMPL_H_ #pragma once -#include "include/cef_x509_certificate.h" - +#include "cef/include/cef_x509_certificate.h" #include "net/cert/x509_cert_types.h" // CefX509CertPrincipal implementation diff --git a/libcef/browser/x509_certificate_impl.cc b/libcef/browser/x509_certificate_impl.cc index 2aeb00bb3..5c60fa396 100644 --- a/libcef/browser/x509_certificate_impl.cc +++ b/libcef/browser/x509_certificate_impl.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/x509_certificate_impl.h" - -#include "libcef/browser/x509_cert_principal_impl.h" -#include "libcef/common/time_util.h" +#include "cef/libcef/browser/x509_certificate_impl.h" +#include "cef/libcef/browser/x509_cert_principal_impl.h" +#include "cef/libcef/common/time_util.h" #include "net/cert/x509_util.h" #include "net/ssl/ssl_private_key.h" diff --git a/libcef/browser/x509_certificate_impl.h b/libcef/browser/x509_certificate_impl.h index 5178ca392..7a7aeec77 100644 --- a/libcef/browser/x509_certificate_impl.h +++ b/libcef/browser/x509_certificate_impl.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_BROWSER_X509_CERTIFICATE_IMPL_H_ #pragma once -#include "include/cef_x509_certificate.h" - #include +#include "cef/include/cef_x509_certificate.h" #include "net/ssl/client_cert_identity.h" // CefX509Certificate implementation diff --git a/libcef/browser/xml_reader_impl.cc b/libcef/browser/xml_reader_impl.cc index 8ba9a089b..c8a29db83 100644 --- a/libcef/browser/xml_reader_impl.cc +++ b/libcef/browser/xml_reader_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/xml_reader_impl.h" - -#include "include/cef_stream.h" +#include "cef/libcef/browser/xml_reader_impl.h" #include "base/logging.h" #include "base/notreached.h" +#include "cef/include/cef_stream.h" // Static functions diff --git a/libcef/browser/xml_reader_impl.h b/libcef/browser/xml_reader_impl.h index cecda7326..d9ab1b95b 100644 --- a/libcef/browser/xml_reader_impl.h +++ b/libcef/browser/xml_reader_impl.h @@ -7,10 +7,11 @@ #pragma once #include + #include #include "base/threading/platform_thread.h" -#include "include/cef_xml_reader.h" +#include "cef/include/cef_xml_reader.h" // Implementation of CefXmlReader class CefXmlReaderImpl : public CefXmlReader { diff --git a/libcef/browser/zip_reader_impl.cc b/libcef/browser/zip_reader_impl.cc index 6b7e5e423..58128b1af 100644 --- a/libcef/browser/zip_reader_impl.cc +++ b/libcef/browser/zip_reader_impl.cc @@ -2,12 +2,14 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/browser/zip_reader_impl.h" +#include "cef/libcef/browser/zip_reader_impl.h" + #include + #include "base/logging.h" #include "base/notreached.h" #include "base/time/time.h" -#include "include/cef_stream.h" +#include "cef/include/cef_stream.h" // Static functions diff --git a/libcef/browser/zip_reader_impl.h b/libcef/browser/zip_reader_impl.h index fd63ff818..a999dc1ea 100644 --- a/libcef/browser/zip_reader_impl.h +++ b/libcef/browser/zip_reader_impl.h @@ -9,7 +9,7 @@ #include #include "base/threading/platform_thread.h" -#include "include/cef_zip_reader.h" +#include "cef/include/cef_zip_reader.h" #include "third_party/zlib/contrib/minizip/unzip.h" // Implementation of CefZipReader diff --git a/libcef/common/alloy/alloy_content_client.cc b/libcef/common/alloy/alloy_content_client.cc index 7a03f2531..9e94de8e7 100644 --- a/libcef/common/alloy/alloy_content_client.cc +++ b/libcef/common/alloy/alloy_content_client.cc @@ -3,18 +3,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/alloy/alloy_content_client.h" +#include "cef/libcef/common/alloy/alloy_content_client.h" #include #include -#include "include/cef_stream.h" -#include "include/cef_version.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_util.h" - #include "base/command_line.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" @@ -24,6 +18,11 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "cef/include/cef_stream.h" +#include "cef/include/cef_version.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_paths.h" @@ -40,7 +39,7 @@ #include "ui/base/resource/resource_bundle.h" #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) -#include "libcef/common/cdm_host_file_path.h" +#include "cef/libcef/common/cdm_host_file_path.h" #endif namespace { diff --git a/libcef/common/alloy/alloy_main_delegate.cc b/libcef/common/alloy/alloy_main_delegate.cc index 5cce052a5..ebff53b4b 100644 --- a/libcef/common/alloy/alloy_main_delegate.cc +++ b/libcef/common/alloy/alloy_main_delegate.cc @@ -2,20 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/alloy/alloy_main_delegate.h" +#include "cef/libcef/common/alloy/alloy_main_delegate.h" #include #include -#include "libcef/browser/alloy/alloy_browser_context.h" -#include "libcef/browser/alloy/alloy_content_browser_client.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/command_line_impl.h" -#include "libcef/common/crash_reporting.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/resource_util.h" -#include "libcef/renderer/alloy/alloy_content_renderer_client.h" - #include "base/base_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -28,6 +19,14 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" +#include "cef/libcef/browser/alloy/alloy_browser_context.h" +#include "cef/libcef/browser/alloy/alloy_content_browser_client.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/command_line_impl.h" +#include "cef/libcef/common/crash_reporting.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/resource_util.h" +#include "cef/libcef/renderer/alloy/alloy_content_renderer_client.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_process_singleton.h" #include "chrome/child/pdf_child_init.h" @@ -60,10 +59,10 @@ #include "ui/base/ui_base_switches.h" #if BUILDFLAG(IS_MAC) +#include "cef/libcef/common/util_mac.h" #include "components/crash/core/common/objc_zombie.h" -#include "libcef/common/util_mac.h" #elif BUILDFLAG(IS_POSIX) -#include "libcef/common/util_linux.h" +#include "cef/libcef/common/util_linux.h" #endif #if BUILDFLAG(IS_WIN) diff --git a/libcef/common/alloy/alloy_main_delegate.h b/libcef/common/alloy/alloy_main_delegate.h index a57e34af3..c9e9a1d6a 100644 --- a/libcef/common/alloy/alloy_main_delegate.h +++ b/libcef/common/alloy/alloy_main_delegate.h @@ -8,13 +8,12 @@ #include -#include "include/cef_app.h" -#include "libcef/common/alloy/alloy_content_client.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/main_runner_handler.h" -#include "libcef/common/resource_bundle_delegate.h" -#include "libcef/common/task_runner_manager.h" - +#include "cef/include/cef_app.h" +#include "cef/libcef/common/alloy/alloy_content_client.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/main_runner_handler.h" +#include "cef/libcef/common/resource_bundle_delegate.h" +#include "cef/libcef/common/task_runner_manager.h" #include "content/public/app/content_main_delegate.h" #if BUILDFLAG(IS_WIN) diff --git a/libcef/common/alloy/alloy_main_runner_delegate.cc b/libcef/common/alloy/alloy_main_runner_delegate.cc index 52e604084..60ef671d8 100644 --- a/libcef/common/alloy/alloy_main_runner_delegate.cc +++ b/libcef/common/alloy/alloy_main_runner_delegate.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/alloy/alloy_main_runner_delegate.h" - -#include "libcef/browser/alloy/chrome_browser_process_alloy.h" -#include "libcef/common/alloy/alloy_main_delegate.h" -#include "libcef/renderer/alloy/alloy_content_renderer_client.h" +#include "cef/libcef/common/alloy/alloy_main_runner_delegate.h" +#include "cef/libcef/browser/alloy/chrome_browser_process_alloy.h" +#include "cef/libcef/common/alloy/alloy_main_delegate.h" +#include "cef/libcef/renderer/alloy/alloy_content_renderer_client.h" #include "chrome/browser/chrome_process_singleton.h" #include "content/public/browser/render_process_host.h" #include "ui/base/resource/resource_bundle.h" diff --git a/libcef/common/alloy/alloy_main_runner_delegate.h b/libcef/common/alloy/alloy_main_runner_delegate.h index c0be48fe9..9b11a8f01 100644 --- a/libcef/common/alloy/alloy_main_runner_delegate.h +++ b/libcef/common/alloy/alloy_main_runner_delegate.h @@ -8,9 +8,9 @@ #include -#include "include/cef_base.h" -#include "libcef/common/main_runner_delegate.h" -#include "libcef/common/main_runner_handler.h" +#include "cef/include/cef_base.h" +#include "cef/libcef/common/main_runner_delegate.h" +#include "cef/libcef/common/main_runner_handler.h" class AlloyMainDelegate; diff --git a/libcef/common/app_manager.cc b/libcef/common/app_manager.cc index df013427b..29b3e2b15 100644 --- a/libcef/common/app_manager.cc +++ b/libcef/common/app_manager.cc @@ -2,23 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/app_manager.h" - -#include "libcef/common/net/scheme_info.h" -#include "libcef/common/scheme_registrar_impl.h" +#include "cef/libcef/common/app_manager.h" #include "base/command_line.h" #include "base/logging.h" +#include "cef/libcef/common/net/scheme_info.h" +#include "cef/libcef/common/scheme_registrar_impl.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/common/content_switches.h" #if BUILDFLAG(IS_WIN) #include + #include "base/path_service.h" #endif #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/common/net/scheme_registration.h" +#include "cef/libcef/common/net/scheme_registration.h" #endif namespace { diff --git a/libcef/common/app_manager.h b/libcef/common/app_manager.h index e0e3e9aaf..ed6c72136 100644 --- a/libcef/common/app_manager.h +++ b/libcef/common/app_manager.h @@ -8,11 +8,10 @@ #include -#include "include/cef_app.h" -#include "include/cef_request_context.h" - #include "base/functional/callback.h" #include "build/build_config.h" +#include "cef/include/cef_app.h" +#include "cef/include/cef_request_context.h" #include "content/public/common/content_client.h" class CefBrowserContext; diff --git a/libcef/common/base_impl.cc b/libcef/common/base_impl.cc index 9a4333e9e..f47ded335 100644 --- a/libcef/common/base_impl.cc +++ b/libcef/common/base_impl.cc @@ -2,15 +2,13 @@ // 2011 the Chromium 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/base/cef_build.h" - -#include "include/internal/cef_logging_internal.h" -#include "include/internal/cef_thread_internal.h" -#include "include/internal/cef_trace_event_internal.h" - #include "base/logging.h" #include "base/threading/platform_thread.h" #include "base/trace_event/trace_event.h" +#include "cef/include/base/cef_build.h" +#include "cef/include/internal/cef_logging_internal.h" +#include "cef/include/internal/cef_thread_internal.h" +#include "cef/include/internal/cef_trace_event_internal.h" namespace { diff --git a/libcef/common/cdm_host_file_path.cc b/libcef/common/cdm_host_file_path.cc index d76009fab..0fec85796 100644 --- a/libcef/common/cdm_host_file_path.cc +++ b/libcef/common/cdm_host_file_path.cc @@ -2,7 +2,7 @@ // 2017 The Chromium Authors. Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -#include "libcef/common/cdm_host_file_path.h" +#include "cef/libcef/common/cdm_host_file_path.h" #include "base/check.h" #include "base/files/file_path.h" @@ -15,7 +15,7 @@ #include "chrome/common/chrome_version.h" #if BUILDFLAG(IS_MAC) -#include "libcef/common/util_mac.h" +#include "cef/libcef/common/util_mac.h" #endif namespace cef { diff --git a/libcef/common/cef_crash_report_upload_thread.cc b/libcef/common/cef_crash_report_upload_thread.cc index 36b94e7fe..5a824bdaf 100644 --- a/libcef/common/cef_crash_report_upload_thread.cc +++ b/libcef/common/cef_crash_report_upload_thread.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/cef_crash_report_upload_thread.h" +#include "cef/libcef/common/cef_crash_report_upload_thread.h" #include "base/notreached.h" -#include "libcef/common/cef_crash_report_utils.h" +#include "cef/libcef/common/cef_crash_report_utils.h" #include "third_party/crashpad/crashpad/client/settings.h" using namespace crashpad; diff --git a/libcef/common/cef_crash_report_utils.cc b/libcef/common/cef_crash_report_utils.cc index 2980643d6..c606e0c05 100644 --- a/libcef/common/cef_crash_report_utils.cc +++ b/libcef/common/cef_crash_report_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/cef_crash_report_utils.h" +#include "cef/libcef/common/cef_crash_report_utils.h" #include "base/strings/string_split.h" diff --git a/libcef/common/cef_switches.cc b/libcef/common/cef_switches.cc index d0223692f..29dbf83ba 100644 --- a/libcef/common/cef_switches.cc +++ b/libcef/common/cef_switches.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/cef_switches.h" +#include "cef/libcef/common/cef_switches.h" namespace switches { diff --git a/libcef/common/chrome/chrome_content_client_cef.cc b/libcef/common/chrome/chrome_content_client_cef.cc index e64a6c3e4..2b0b561fc 100644 --- a/libcef/common/chrome/chrome_content_client_cef.cc +++ b/libcef/common/chrome/chrome_content_client_cef.cc @@ -3,14 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/chrome/chrome_content_client_cef.h" - -#include "libcef/common/app_manager.h" +#include "cef/libcef/common/chrome/chrome_content_client_cef.h" +#include "cef/libcef/common/app_manager.h" #include "chrome/common/media/cdm_registration.h" #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) -#include "libcef/common/cdm_host_file_path.h" +#include "cef/libcef/common/cdm_host_file_path.h" #endif ChromeContentClientCef::ChromeContentClientCef() = default; diff --git a/libcef/common/chrome/chrome_main_delegate_cef.cc b/libcef/common/chrome/chrome_main_delegate_cef.cc index c624e844a..502570dd6 100644 --- a/libcef/common/chrome/chrome_main_delegate_cef.cc +++ b/libcef/common/chrome/chrome_main_delegate_cef.cc @@ -3,22 +3,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/chrome/chrome_main_delegate_cef.h" +#include "cef/libcef/common/chrome/chrome_main_delegate_cef.h" #include -#include "libcef/browser/chrome/chrome_browser_context.h" -#include "libcef/browser/chrome/chrome_content_browser_client_cef.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/command_line_impl.h" -#include "libcef/common/crash_reporting.h" -#include "libcef/common/resource_util.h" -#include "libcef/renderer/chrome/chrome_content_renderer_client_cef.h" - #include "base/base_switches.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/threading/threading_features.h" +#include "cef/libcef/browser/chrome/chrome_browser_context.h" +#include "cef/libcef/browser/chrome/chrome_content_browser_client_cef.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/command_line_impl.h" +#include "cef/libcef/common/crash_reporting.h" +#include "cef/libcef/common/resource_util.h" +#include "cef/libcef/renderer/chrome/chrome_content_renderer_client_cef.h" #include "chrome/browser/metrics/chrome_feature_list_creator.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" #include "chrome/common/chrome_switches.h" @@ -30,9 +29,9 @@ #include "ui/base/ui_base_switches.h" #if BUILDFLAG(IS_MAC) -#include "libcef/common/util_mac.h" +#include "cef/libcef/common/util_mac.h" #elif BUILDFLAG(IS_POSIX) -#include "libcef/common/util_linux.h" +#include "cef/libcef/common/util_linux.h" #endif namespace { diff --git a/libcef/common/chrome/chrome_main_delegate_cef.h b/libcef/common/chrome/chrome_main_delegate_cef.h index e97a42f54..b41d162f5 100644 --- a/libcef/common/chrome/chrome_main_delegate_cef.h +++ b/libcef/common/chrome/chrome_main_delegate_cef.h @@ -8,12 +8,11 @@ #include -#include "include/cef_app.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/chrome/chrome_content_client_cef.h" -#include "libcef/common/main_runner_handler.h" -#include "libcef/common/task_runner_manager.h" - +#include "cef/include/cef_app.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/chrome/chrome_content_client_cef.h" +#include "cef/libcef/common/main_runner_handler.h" +#include "cef/libcef/common/task_runner_manager.h" #include "chrome/app/chrome_main_delegate.h" class ChromeContentBrowserClientCef; diff --git a/libcef/common/chrome/chrome_main_runner_delegate.cc b/libcef/common/chrome/chrome_main_runner_delegate.cc index c639e1f60..cffd45b75 100644 --- a/libcef/common/chrome/chrome_main_runner_delegate.cc +++ b/libcef/common/chrome/chrome_main_runner_delegate.cc @@ -3,13 +3,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/chrome/chrome_main_runner_delegate.h" - -#include "libcef/common/app_manager.h" -#include "libcef/common/chrome/chrome_main_delegate_cef.h" +#include "cef/libcef/common/chrome/chrome_main_runner_delegate.h" #include "base/command_line.h" #include "base/run_loop.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/chrome/chrome_main_delegate_cef.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_process_singleton.h" diff --git a/libcef/common/chrome/chrome_main_runner_delegate.h b/libcef/common/chrome/chrome_main_runner_delegate.h index 3e93ecfcb..442d9d6c8 100644 --- a/libcef/common/chrome/chrome_main_runner_delegate.h +++ b/libcef/common/chrome/chrome_main_runner_delegate.h @@ -8,9 +8,9 @@ #include -#include "include/cef_app.h" -#include "libcef/common/main_runner_delegate.h" -#include "libcef/common/main_runner_handler.h" +#include "cef/include/cef_app.h" +#include "cef/libcef/common/main_runner_delegate.h" +#include "cef/libcef/common/main_runner_handler.h" class ChromeMainDelegateCef; class MainThreadStackSamplingProfiler; diff --git a/libcef/common/command_line_impl.cc b/libcef/common/command_line_impl.cc index 8faeedffb..6f5d00928 100644 --- a/libcef/common/command_line_impl.cc +++ b/libcef/common/command_line_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/command_line_impl.h" +#include "cef/libcef/common/command_line_impl.h" #include "base/files/file_path.h" #include "base/logging.h" diff --git a/libcef/common/command_line_impl.h b/libcef/common/command_line_impl.h index 26b90a705..3a81dad69 100644 --- a/libcef/common/command_line_impl.h +++ b/libcef/common/command_line_impl.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_COMMON_COMMAND_LINE_IMPL_H_ #pragma once -#include "include/cef_command_line.h" -#include "libcef/common/value_base.h" - #include "base/command_line.h" +#include "cef/include/cef_command_line.h" +#include "cef/libcef/common/value_base.h" // CefCommandLine implementation class CefCommandLineImpl diff --git a/libcef/common/crash_reporter_client.cc b/libcef/common/crash_reporter_client.cc index 4e6724e6e..d7f6dbba1 100644 --- a/libcef/common/crash_reporter_client.cc +++ b/libcef/common/crash_reporter_client.cc @@ -2,7 +2,7 @@ // 2016 The Chromium 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 "libcef/common/crash_reporter_client.h" +#include "cef/libcef/common/crash_reporter_client.h" #include #include @@ -23,7 +23,7 @@ #include "third_party/crashpad/crashpad/client/annotation.h" #if BUILDFLAG(IS_MAC) -#include "libcef/common/util_mac.h" +#include "cef/libcef/common/util_mac.h" #endif #if BUILDFLAG(IS_POSIX) @@ -39,8 +39,8 @@ #endif #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#include "cef/libcef/common/cef_crash_report_utils.h" #include "content/public/common/content_switches.h" -#include "libcef/common/cef_crash_report_utils.h" #endif #if BUILDFLAG(IS_WIN) diff --git a/libcef/common/crash_reporter_client.h b/libcef/common/crash_reporter_client.h index f5352c3f4..61d6899ef 100644 --- a/libcef/common/crash_reporter_client.h +++ b/libcef/common/crash_reporter_client.h @@ -9,10 +9,9 @@ #include #include -#include "include/cef_version.h" - #include "base/synchronization/lock.h" #include "build/build_config.h" +#include "cef/include/cef_version.h" #include "components/crash/core/app/crash_reporter_client.h" // Global object that is instantiated in each process and configures crash diff --git a/libcef/common/crash_reporting.cc b/libcef/common/crash_reporting.cc index 997b1cba5..156a5f242 100644 --- a/libcef/common/crash_reporting.cc +++ b/libcef/common/crash_reporting.cc @@ -2,20 +2,19 @@ // 2016 The Chromium 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 "libcef/common/crash_reporting.h" +#include "cef/libcef/common/crash_reporting.h" #include -#include "include/cef_crash_util.h" -#include "libcef/common/cef_switches.h" -#include "libcef/features/runtime.h" - #include "base/base_switches.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_util.h" +#include "cef/include/cef_crash_util.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/features/runtime.h" #include "chrome/common/crash_keys.h" #include "components/crash/core/common/crash_key.h" #include "components/crash/core/common/crash_keys.h" @@ -29,8 +28,8 @@ #if BUILDFLAG(IS_POSIX) #include "base/lazy_instance.h" +#include "cef/libcef/common/crash_reporter_client.h" #include "components/crash/core/app/crashpad.h" -#include "libcef/common/crash_reporter_client.h" #endif namespace crash_reporting { diff --git a/libcef/common/drag_data_impl.cc b/libcef/common/drag_data_impl.cc index f07702498..6f78cc806 100644 --- a/libcef/common/drag_data_impl.cc +++ b/libcef/common/drag_data_impl.cc @@ -2,11 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. +#include "cef/libcef/common/drag_data_impl.h" + #include #include "base/files/file_path.h" -#include "libcef/browser/stream_impl.h" -#include "libcef/common/drag_data_impl.h" +#include "cef/libcef/browser/stream_impl.h" #define CHECK_READONLY_RETURN_VOID() \ if (read_only_) { \ diff --git a/libcef/common/drag_data_impl.h b/libcef/common/drag_data_impl.h index 0f16c30db..3a4981c56 100644 --- a/libcef/common/drag_data_impl.h +++ b/libcef/common/drag_data_impl.h @@ -6,12 +6,11 @@ #define CEF_LIBCEF_COMMON_DRAG_DATA_IMPL_H_ #pragma once -#include "include/cef_drag_data.h" -#include "include/cef_image.h" - #include #include "base/synchronization/lock.h" +#include "cef/include/cef_drag_data.h" +#include "cef/include/cef_image.h" #include "content/public/common/drop_data.h" // Implementation of CefDragData. diff --git a/libcef/common/extensions/chrome_generated_schemas.cc b/libcef/common/extensions/chrome_generated_schemas.cc index c8b3be30a..8097c880b 100644 --- a/libcef/common/extensions/chrome_generated_schemas.cc +++ b/libcef/common/extensions/chrome_generated_schemas.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/extensions/chrome_generated_schemas.h" - -#include "libcef/browser/extensions/chrome_api_registration.h" +#include "cef/libcef/common/extensions/chrome_generated_schemas.h" +#include "cef/libcef/browser/extensions/chrome_api_registration.h" #include "chrome/common/extensions/api/generated_schemas.h" namespace extensions::api::cef { diff --git a/libcef/common/extensions/extensions_api_provider.cc b/libcef/common/extensions/extensions_api_provider.cc index 249c81a92..0ed5c44ee 100644 --- a/libcef/common/extensions/extensions_api_provider.cc +++ b/libcef/common/extensions/extensions_api_provider.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/extensions/extensions_api_provider.h" - -#include "libcef/common/extensions/chrome_generated_schemas.h" +#include "cef/libcef/common/extensions/extensions_api_provider.h" #include "cef/grit/cef_resources.h" +#include "cef/libcef/common/extensions/chrome_generated_schemas.h" // #include "cef/libcef/common/extensions/api/generated_schemas.h" #include "cef/libcef/common/extensions/api/cef_api_features.h" #include "cef/libcef/common/extensions/api/cef_manifest_features.h" diff --git a/libcef/common/extensions/extensions_client.cc b/libcef/common/extensions/extensions_client.cc index 151cbcfb1..5f0993013 100644 --- a/libcef/common/extensions/extensions_client.cc +++ b/libcef/common/extensions/extensions_client.cc @@ -3,14 +3,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/extensions/extensions_client.h" +#include "cef/libcef/common/extensions/extensions_client.h" #include -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_api_provider.h" - #include "base/logging.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_api_provider.h" #include "extensions/common/core_extensions_api_provider.h" #include "extensions/common/extension_urls.h" #include "extensions/common/features/simple_feature.h" diff --git a/libcef/common/extensions/extensions_util.cc b/libcef/common/extensions/extensions_util.cc index 35ae9eda5..3b99d5938 100644 --- a/libcef/common/extensions/extensions_util.cc +++ b/libcef/common/extensions/extensions_util.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/common/extensions/extensions_util.h" - -#include "libcef/common/cef_switches.h" -#include "libcef/features/runtime.h" +#include "cef/libcef/common/extensions/extensions_util.h" #include "base/command_line.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/features/runtime.h" #include "chrome/common/chrome_switches.h" namespace extensions { diff --git a/libcef/common/file_util_impl.cc b/libcef/common/file_util_impl.cc index 48387babc..98ce60889 100644 --- a/libcef/common/file_util_impl.cc +++ b/libcef/common/file_util_impl.cc @@ -2,13 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_file_util.h" - -#include "include/cef_task.h" - #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "cef/include/cef_file_util.h" +#include "cef/include/cef_task.h" #include "third_party/zlib/google/zip.h" namespace { diff --git a/libcef/common/frame_util.cc b/libcef/common/frame_util.cc index aa819148d..a4badaeb0 100644 --- a/libcef/common/frame_util.cc +++ b/libcef/common/frame_util.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/frame_util.h" - -#include "libcef/browser/thread_util.h" +#include "cef/libcef/common/frame_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "cef/libcef/browser/thread_util.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/render_frame_host.h" diff --git a/libcef/common/frame_util.h b/libcef/common/frame_util.h index cb860f43e..71740dd75 100644 --- a/libcef/common/frame_util.h +++ b/libcef/common/frame_util.h @@ -6,6 +6,7 @@ #define CEF_LIBCEF_COMMON_FRAME_UTIL_H_ #include + #include #include diff --git a/libcef/common/i18n_util_impl.cc b/libcef/common/i18n_util_impl.cc index b4f901b08..dfd81d49d 100644 --- a/libcef/common/i18n_util_impl.cc +++ b/libcef/common/i18n_util_impl.cc @@ -2,9 +2,8 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_i18n_util.h" - #include "base/i18n/rtl.h" +#include "cef/include/cef_i18n_util.h" bool CefIsRTL() { return base::i18n::IsRTL(); diff --git a/libcef/common/json_impl.cc b/libcef/common/json_impl.cc index 2a88f2c1b..a0896169f 100644 --- a/libcef/common/json_impl.cc +++ b/libcef/common/json_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_parser.h" -#include "libcef/common/values_impl.h" - #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/values.h" +#include "cef/include/cef_parser.h" +#include "cef/libcef/common/values_impl.h" namespace { diff --git a/libcef/common/main_runner_delegate.h b/libcef/common/main_runner_delegate.h index 9a3a0c83d..11450aef0 100644 --- a/libcef/common/main_runner_delegate.h +++ b/libcef/common/main_runner_delegate.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_COMMON_MAIN_RUNNER_DELEGATE_H_ #pragma once -#include "include/cef_app.h" +#include "cef/include/cef_app.h" namespace base { class RunLoop; diff --git a/libcef/common/net/http_header_utils.cc b/libcef/common/net/http_header_utils.cc index 498fc6e0b..bcc130022 100644 --- a/libcef/common/net/http_header_utils.cc +++ b/libcef/common/net/http_header_utils.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/net/http_header_utils.h" +#include "cef/libcef/common/net/http_header_utils.h" #include diff --git a/libcef/common/net/http_header_utils.h b/libcef/common/net/http_header_utils.h index 45886bca8..3d723abc7 100644 --- a/libcef/common/net/http_header_utils.h +++ b/libcef/common/net/http_header_utils.h @@ -9,7 +9,7 @@ #include #include -#include "include/cef_base.h" +#include "cef/include/cef_base.h" namespace HttpHeaderUtils { diff --git a/libcef/common/net/net_resource_provider.cc b/libcef/common/net/net_resource_provider.cc index eea3db750..18346aaab 100644 --- a/libcef/common/net/net_resource_provider.cc +++ b/libcef/common/net/net_resource_provider.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/net/net_resource_provider.h" +#include "cef/libcef/common/net/net_resource_provider.h" #include "base/logging.h" #include "chrome/common/net/net_resource_provider.h" diff --git a/libcef/common/net/scheme_registration.cc b/libcef/common/net/scheme_registration.cc index 9cf426d33..bf3838292 100644 --- a/libcef/common/net/scheme_registration.cc +++ b/libcef/common/net/scheme_registration.cc @@ -2,19 +2,18 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/net/scheme_registration.h" - -#include "libcef/features/runtime.h" +#include "cef/libcef/common/net/scheme_registration.h" #include "base/containers/contains.h" +#include "cef/libcef/features/runtime.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "url/url_constants.h" #include "url/url_util.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) -#include "libcef/common/app_manager.h" -#include "libcef/common/net/scheme_info.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/net/scheme_info.h" #endif namespace scheme { diff --git a/libcef/common/net/url_util.cc b/libcef/common/net/url_util.cc index 710601d8d..1e6b5a917 100644 --- a/libcef/common/net/url_util.cc +++ b/libcef/common/net/url_util.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/net/url_util.h" +#include "cef/libcef/common/net/url_util.h" #include "base/logging.h" #include "components/url_formatter/url_fixer.h" diff --git a/libcef/common/net/url_util.h b/libcef/common/net/url_util.h index d5c0112cc..def205476 100644 --- a/libcef/common/net/url_util.h +++ b/libcef/common/net/url_util.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_COMMON_NET_URL_UTIL_H_ #pragma once -#include "include/cef_base.h" +#include "cef/include/cef_base.h" class GURL; diff --git a/libcef/common/net_service/net_service_util.cc b/libcef/common/net_service/net_service_util.cc index 71d897016..5e96936fd 100644 --- a/libcef/common/net_service/net_service_util.cc +++ b/libcef/common/net_service/net_service_util.cc @@ -3,15 +3,14 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#include "libcef/common/net_service/net_service_util.h" - -#include "include/internal/cef_time_wrappers.h" -#include "libcef/common/time_util.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include #include "base/logging.h" #include "base/strings/string_number_conversions.h" +#include "cef/include/internal/cef_time_wrappers.h" +#include "cef/libcef/common/time_util.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_util.h" #include "net/cookies/parsed_cookie.h" diff --git a/libcef/common/net_service/net_service_util.h b/libcef/common/net_service/net_service_util.h index 0eaa62d50..5281d4981 100644 --- a/libcef/common/net_service/net_service_util.h +++ b/libcef/common/net_service/net_service_util.h @@ -8,9 +8,8 @@ #include #include -#include "include/internal/cef_types_wrappers.h" - #include "base/memory/scoped_refptr.h" +#include "cef/include/internal/cef_types_wrappers.h" #include "net/cookies/cookie_constants.h" namespace net { diff --git a/libcef/common/parser_impl.cc b/libcef/common/parser_impl.cc index 1c0a8acf1..910ab1cb8 100644 --- a/libcef/common/parser_impl.cc +++ b/libcef/common/parser_impl.cc @@ -4,11 +4,10 @@ #include -#include "include/cef_parser.h" - #include "base/base64.h" #include "base/strings/escape.h" #include "base/threading/thread_restrictions.h" +#include "cef/include/cef_parser.h" #include "components/url_formatter/elide_url.h" #include "net/base/mime_util.h" #include "url/gurl.h" diff --git a/libcef/common/process_message_impl.cc b/libcef/common/process_message_impl.cc index e90ef83a2..6d69447c8 100644 --- a/libcef/common/process_message_impl.cc +++ b/libcef/common/process_message_impl.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/process_message_impl.h" +#include "cef/libcef/common/process_message_impl.h" #include -#include "libcef/common/values_impl.h" - #include "base/logging.h" +#include "cef/libcef/common/values_impl.h" // static CefRefPtr CefProcessMessage::Create(const CefString& name) { diff --git a/libcef/common/process_message_impl.h b/libcef/common/process_message_impl.h index eadeca189..2715de2bd 100644 --- a/libcef/common/process_message_impl.h +++ b/libcef/common/process_message_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_PROCESS_MESSAGE_IMPL_H_ #pragma once -#include "include/cef_process_message.h" - #include "base/values.h" +#include "cef/include/cef_process_message.h" // CefProcessMessage implementation. class CefProcessMessageImpl : public CefProcessMessage { diff --git a/libcef/common/process_message_smr_impl.cc b/libcef/common/process_message_smr_impl.cc index 2cfe11473..f7f9f7406 100644 --- a/libcef/common/process_message_smr_impl.cc +++ b/libcef/common/process_message_smr_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/process_message_smr_impl.h" +#include "cef/libcef/common/process_message_smr_impl.h" #include "base/logging.h" #include "base/memory/ptr_util.h" diff --git a/libcef/common/process_message_smr_impl.h b/libcef/common/process_message_smr_impl.h index 1f36feb86..4063fdf42 100644 --- a/libcef/common/process_message_smr_impl.h +++ b/libcef/common/process_message_smr_impl.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_COMMON_PROCESS_MESSAGE_SMR_IMPL_H_ #pragma once -#include "include/cef_process_message.h" -#include "include/cef_shared_process_message_builder.h" - #include "base/memory/writable_shared_memory_region.h" +#include "cef/include/cef_process_message.h" +#include "cef/include/cef_shared_process_message_builder.h" class CefProcessMessageSMRImpl final : public CefProcessMessage { public: diff --git a/libcef/common/request_impl.cc b/libcef/common/request_impl.cc index 4230eb935..b75e37543 100644 --- a/libcef/common/request_impl.cc +++ b/libcef/common/request_impl.cc @@ -2,6 +2,8 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. +#include "cef/libcef/common/request_impl.h" + #include #include #include @@ -9,15 +11,13 @@ #include #include -#include "libcef/common/net/http_header_utils.h" -#include "libcef/common/net_service/net_service_util.h" -#include "libcef/common/request_impl.h" - #include "base/command_line.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/libcef/common/net/http_header_utils.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_handle.h" #include "content/public/common/content_switches.h" diff --git a/libcef/common/request_impl.h b/libcef/common/request_impl.h index 7d4753b58..88a7d27d2 100644 --- a/libcef/common/request_impl.h +++ b/libcef/common/request_impl.h @@ -10,9 +10,8 @@ #include -#include "include/cef_request.h" - #include "base/synchronization/lock.h" +#include "cef/include/cef_request.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "net/cookies/site_for_cookies.h" #include "services/network/public/mojom/referrer_policy.mojom-shared.h" diff --git a/libcef/common/resource_bundle_delegate.cc b/libcef/common/resource_bundle_delegate.cc index 31015e7aa..c7876d297 100644 --- a/libcef/common/resource_bundle_delegate.cc +++ b/libcef/common/resource_bundle_delegate.cc @@ -1,6 +1,6 @@ -#include "libcef/common/resource_bundle_delegate.h" +#include "cef/libcef/common/resource_bundle_delegate.h" -#include "libcef/common/app_manager.h" +#include "cef/libcef/common/app_manager.h" base::FilePath CefResourceBundleDelegate::GetPathForResourcePack( const base::FilePath& pack_path, diff --git a/libcef/common/resource_bundle_impl.cc b/libcef/common/resource_bundle_impl.cc index 87c36f5b3..7be4e2b90 100644 --- a/libcef/common/resource_bundle_impl.cc +++ b/libcef/common/resource_bundle_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/resource_bundle_impl.h" +#include "cef/libcef/common/resource_bundle_impl.h" #include "base/memory/ref_counted_memory.h" #include "ui/base/resource/resource_bundle.h" diff --git a/libcef/common/resource_bundle_impl.h b/libcef/common/resource_bundle_impl.h index e759dae5b..bc644271e 100644 --- a/libcef/common/resource_bundle_impl.h +++ b/libcef/common/resource_bundle_impl.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_COMMON_RESOURCE_BUNDLE_IMPL_H_ #pragma once -#include "include/cef_resource_bundle.h" +#include "cef/include/cef_resource_bundle.h" class CefResourceBundleImpl : public CefResourceBundle { public: diff --git a/libcef/common/resource_util.cc b/libcef/common/resource_util.cc index a7a5f007c..f465c6810 100644 --- a/libcef/common/resource_util.cc +++ b/libcef/common/resource_util.cc @@ -2,7 +2,7 @@ // 2011 The Chromium 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 "libcef/common/resource_util.h" +#include "cef/libcef/common/resource_util.h" #if BUILDFLAG(IS_LINUX) #include @@ -30,7 +30,7 @@ #if BUILDFLAG(IS_MAC) #include "base/apple/foundation_util.h" -#include "libcef/common/util_mac.h" +#include "cef/libcef/common/util_mac.h" #endif #if BUILDFLAG(IS_WIN) diff --git a/libcef/common/resource_util.h b/libcef/common/resource_util.h index 3c08d9a52..96591e993 100644 --- a/libcef/common/resource_util.h +++ b/libcef/common/resource_util.h @@ -6,8 +6,7 @@ #define CEF_LIBCEF_COMMON_RESOURCE_UTIL_H_ #pragma once -#include "include/cef_base.h" - +#include "cef/include/cef_base.h" #include "cef/libcef/features/features.h" #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) diff --git a/libcef/common/response_impl.cc b/libcef/common/response_impl.cc index 8e4926148..3a0f69f11 100644 --- a/libcef/common/response_impl.cc +++ b/libcef/common/response_impl.cc @@ -2,15 +2,14 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/response_impl.h" +#include "cef/libcef/common/response_impl.h" #include -#include "libcef/common/net/http_header_utils.h" -#include "libcef/common/net_service/net_service_util.h" - #include "base/logging.h" #include "base/strings/string_util.h" +#include "cef/libcef/common/net/http_header_utils.h" +#include "cef/libcef/common/net_service/net_service_util.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "third_party/blink/public/platform/web_http_header_visitor.h" diff --git a/libcef/common/response_impl.h b/libcef/common/response_impl.h index 7b4af61b3..ef0f9337f 100644 --- a/libcef/common/response_impl.h +++ b/libcef/common/response_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_RESPONSE_IMPL_H_ #pragma once -#include "include/cef_response.h" - #include "base/synchronization/lock.h" +#include "cef/include/cef_response.h" namespace net { class HttpResponseHeaders; diff --git a/libcef/common/scheme_registrar_impl.cc b/libcef/common/scheme_registrar_impl.cc index 285373ad2..8eaef705e 100644 --- a/libcef/common/scheme_registrar_impl.cc +++ b/libcef/common/scheme_registrar_impl.cc @@ -2,17 +2,16 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/scheme_registrar_impl.h" +#include "cef/libcef/common/scheme_registrar_impl.h" #include -#include "libcef/common/app_manager.h" -#include "libcef/common/net/scheme_info.h" -#include "libcef/common/net/scheme_registration.h" - #include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/net/scheme_info.h" +#include "cef/libcef/common/net/scheme_registration.h" namespace { diff --git a/libcef/common/scheme_registrar_impl.h b/libcef/common/scheme_registrar_impl.h index 375b437d5..fb01cc1fc 100644 --- a/libcef/common/scheme_registrar_impl.h +++ b/libcef/common/scheme_registrar_impl.h @@ -9,8 +9,7 @@ #include #include -#include "include/cef_scheme.h" - +#include "cef/include/cef_scheme.h" #include "content/public/common/content_client.h" class CefSchemeRegistrarImpl : public CefSchemeRegistrar { diff --git a/libcef/common/string_list_impl.cc b/libcef/common/string_list_impl.cc index 1a3c01da6..20e50d527 100644 --- a/libcef/common/string_list_impl.cc +++ b/libcef/common/string_list_impl.cc @@ -4,9 +4,8 @@ #include -#include "include/internal/cef_string_list.h" - #include "base/check_op.h" +#include "cef/include/internal/cef_string_list.h" namespace { using StringList = std::vector; diff --git a/libcef/common/string_map_impl.cc b/libcef/common/string_map_impl.cc index 53226274a..6c0aa5042 100644 --- a/libcef/common/string_map_impl.cc +++ b/libcef/common/string_map_impl.cc @@ -5,9 +5,8 @@ #include #include -#include "include/internal/cef_string_map.h" - #include "base/check_op.h" +#include "cef/include/internal/cef_string_map.h" namespace { diff --git a/libcef/common/string_multimap_impl.cc b/libcef/common/string_multimap_impl.cc index 833b8465f..c9ee0757c 100644 --- a/libcef/common/string_multimap_impl.cc +++ b/libcef/common/string_multimap_impl.cc @@ -5,9 +5,8 @@ #include #include -#include "include/internal/cef_string_multimap.h" - #include "base/check_op.h" +#include "cef/include/internal/cef_string_multimap.h" namespace { diff --git a/libcef/common/string_types_impl.cc b/libcef/common/string_types_impl.cc index ab8bda135..bbc075417 100644 --- a/libcef/common/string_types_impl.cc +++ b/libcef/common/string_types_impl.cc @@ -4,12 +4,11 @@ #include -#include "include/internal/cef_string_types.h" - #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/include/internal/cef_string_types.h" namespace { diff --git a/libcef/common/string_util.cc b/libcef/common/string_util.cc index bb187797c..52cca4677 100644 --- a/libcef/common/string_util.cc +++ b/libcef/common/string_util.cc @@ -2,7 +2,7 @@ // 2011 The Chromium 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 "libcef/common/string_util.h" +#include "cef/libcef/common/string_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted_memory.h" @@ -69,4 +69,4 @@ void ExecuteWithScopedCefString(base::ReadOnlySharedMemoryRegion region, std::move(callback).Run(str); } -} // namespace string_util \ No newline at end of file +} // namespace string_util diff --git a/libcef/common/string_util.h b/libcef/common/string_util.h index f97276536..3ff60815b 100644 --- a/libcef/common/string_util.h +++ b/libcef/common/string_util.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_COMMON_STRING_UTIL_H_ #pragma once -#include "include/cef_base.h" - #include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" +#include "cef/include/cef_base.h" namespace base { class ReadOnlySharedMemoryRegion; diff --git a/libcef/common/task_impl.cc b/libcef/common/task_impl.cc index a709c4b33..ea7353ef6 100644 --- a/libcef/common/task_impl.cc +++ b/libcef/common/task_impl.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_task.h" -#include "libcef/common/task_runner_impl.h" - #include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/time/time.h" +#include "cef/include/cef_task.h" +#include "cef/libcef/common/task_runner_impl.h" bool CefCurrentlyOn(CefThreadId threadId) { scoped_refptr task_runner = diff --git a/libcef/common/task_runner_impl.cc b/libcef/common/task_runner_impl.cc index 46f274487..d96c8fa21 100644 --- a/libcef/common/task_runner_impl.cc +++ b/libcef/common/task_runner_impl.cc @@ -2,9 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/task_runner_impl.h" - -#include "libcef/common/task_runner_manager.h" +#include "cef/libcef/common/task_runner_impl.h" #include "base/functional/bind.h" #include "base/location.h" @@ -12,6 +10,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/time.h" +#include "cef/libcef/common/task_runner_manager.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_launcher_utils.h" diff --git a/libcef/common/task_runner_impl.h b/libcef/common/task_runner_impl.h index 8afbfab69..11562960a 100644 --- a/libcef/common/task_runner_impl.h +++ b/libcef/common/task_runner_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_TASK_RUNNER_IMPL_H_ #pragma once -#include "include/cef_task.h" - #include "base/task/single_thread_task_runner.h" +#include "cef/include/cef_task.h" class CefTaskRunnerImpl : public CefTaskRunner { public: diff --git a/libcef/common/task_runner_manager.cc b/libcef/common/task_runner_manager.cc index 2318e58ad..3df3a6d63 100644 --- a/libcef/common/task_runner_manager.cc +++ b/libcef/common/task_runner_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/common/task_runner_manager.h" +#include "cef/libcef/common/task_runner_manager.h" #include "base/logging.h" diff --git a/libcef/common/test/translator_test_impl.cc b/libcef/common/test/translator_test_impl.cc index 0e4545a46..75e37b429 100644 --- a/libcef/common/test/translator_test_impl.cc +++ b/libcef/common/test/translator_test_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/test/cef_translator_test.h" +#include "cef/include/test/cef_translator_test.h" class CefTranslatorTestRefPtrLibraryImpl : public CefTranslatorTestRefPtrLibrary { diff --git a/libcef/common/thread_impl.cc b/libcef/common/thread_impl.cc index ef5ff5eb4..ee103b7f4 100644 --- a/libcef/common/thread_impl.cc +++ b/libcef/common/thread_impl.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/thread_impl.h" +#include "cef/libcef/common/thread_impl.h" #include -#include "libcef/common/task_runner_impl.h" - #include "base/functional/bind.h" #include "base/threading/thread_restrictions.h" +#include "cef/libcef/common/task_runner_impl.h" namespace { diff --git a/libcef/common/thread_impl.h b/libcef/common/thread_impl.h index 007d52455..cca5b8df1 100644 --- a/libcef/common/thread_impl.h +++ b/libcef/common/thread_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_THREAD_IMPL_H_ #pragma once -#include "include/cef_thread.h" - #include "base/threading/thread.h" +#include "cef/include/cef_thread.h" class CefThreadImpl : public CefThread { public: diff --git a/libcef/common/time_impl.cc b/libcef/common/time_impl.cc index f09e0e937..96b51a03c 100644 --- a/libcef/common/time_impl.cc +++ b/libcef/common/time_impl.cc @@ -2,13 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/internal/cef_time_wrappers.h" -#include "include/internal/cef_types_wrappers.h" -#include "libcef/common/time_util.h" - #include #include +#include "cef/include/internal/cef_time_wrappers.h" +#include "cef/include/internal/cef_types_wrappers.h" +#include "cef/libcef/common/time_util.h" + #if BUILDFLAG(IS_WIN) namespace { diff --git a/libcef/common/time_util.h b/libcef/common/time_util.h index bbfa0748f..c58149fce 100644 --- a/libcef/common/time_util.h +++ b/libcef/common/time_util.h @@ -7,7 +7,7 @@ #pragma once #include "base/time/time.h" -#include "include/internal/cef_time.h" +#include "cef/include/internal/cef_time.h" // Converts cef_time_t to/from a base::Time object. void cef_time_to_basetime(const cef_time_t& cef_time, base::Time& time); diff --git a/libcef/common/tracker.cc b/libcef/common/tracker.cc index bb69a080b..6c8ac1624 100644 --- a/libcef/common/tracker.cc +++ b/libcef/common/tracker.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/tracker.h" +#include "cef/libcef/common/tracker.h" // CefTrackNode implementation. diff --git a/libcef/common/tracker.h b/libcef/common/tracker.h index 1a01d9218..07ed09c47 100644 --- a/libcef/common/tracker.h +++ b/libcef/common/tracker.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_TRACKER_H_ #pragma once -#include "include/cef_base.h" - #include "base/synchronization/lock.h" +#include "cef/include/cef_base.h" // Class extended by objects that must be tracked. After creating a tracked // object you should add it to the appropriate track manager. diff --git a/libcef/common/urlrequest_impl.cc b/libcef/common/urlrequest_impl.cc index 60ba1aa9c..99841edb5 100644 --- a/libcef/common/urlrequest_impl.cc +++ b/libcef/common/urlrequest_impl.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "include/cef_urlrequest.h" -#include "libcef/browser/net_service/browser_urlrequest_impl.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/task_runner_impl.h" - #include "base/logging.h" #include "base/notreached.h" +#include "cef/include/cef_urlrequest.h" +#include "cef/libcef/browser/net_service/browser_urlrequest_impl.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/task_runner_impl.h" #include "content/public/common/content_client.h" // static diff --git a/libcef/common/util_linux.cc b/libcef/common/util_linux.cc index e6b090956..4c80ceee7 100644 --- a/libcef/common/util_linux.cc +++ b/libcef/common/util_linux.cc @@ -2,7 +2,7 @@ // 2011 The Chromium 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 "libcef/common/util_linux.h" +#include "cef/libcef/common/util_linux.h" #include "base/command_line.h" #include "base/files/file_path.h" diff --git a/libcef/common/util_mac.mm b/libcef/common/util_mac.mm index d6c8d1d35..00bdc45dd 100644 --- a/libcef/common/util_mac.mm +++ b/libcef/common/util_mac.mm @@ -2,9 +2,7 @@ // 2011 The Chromium 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 "libcef/common/util_mac.h" - -#include "libcef/common/cef_switches.h" +#include "cef/libcef/common/util_mac.h" #include "base/apple/bundle_locations.h" #include "base/apple/foundation_util.h" @@ -13,6 +11,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" +#include "cef/libcef/common/cef_switches.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" diff --git a/libcef/common/value_base.cc b/libcef/common/value_base.cc index 1e23f52e6..304b3b7a4 100644 --- a/libcef/common/value_base.cc +++ b/libcef/common/value_base.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/value_base.h" +#include "cef/libcef/common/value_base.h" CefValueController::CefValueController() = default; diff --git a/libcef/common/value_base.h b/libcef/common/value_base.h index ce791ec43..9add874e7 100644 --- a/libcef/common/value_base.h +++ b/libcef/common/value_base.h @@ -8,7 +8,6 @@ #include #include -#include "include/cef_base.h" #include "base/logging.h" #include "base/memory/ref_counted.h" @@ -16,6 +15,7 @@ #include "base/synchronization/lock.h" #include "base/thread_annotations.h" #include "base/threading/platform_thread.h" +#include "cef/include/cef_base.h" // Controller implementation base class. class CefValueController diff --git a/libcef/common/values_impl.cc b/libcef/common/values_impl.cc index 688493630..24ec92690 100644 --- a/libcef/common/values_impl.cc +++ b/libcef/common/values_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/common/values_impl.h" +#include "cef/libcef/common/values_impl.h" #include #include diff --git a/libcef/common/values_impl.h b/libcef/common/values_impl.h index f5fb6afa9..5ebdd6bfe 100644 --- a/libcef/common/values_impl.h +++ b/libcef/common/values_impl.h @@ -9,11 +9,10 @@ #include #include -#include "include/cef_values.h" -#include "libcef/common/value_base.h" - #include "base/threading/platform_thread.h" #include "base/values.h" +#include "cef/include/cef_values.h" +#include "cef/libcef/common/value_base.h" // CefValue implementation class CefValueImpl : public CefValue { diff --git a/libcef/common/waitable_event_impl.cc b/libcef/common/waitable_event_impl.cc index 2ead5e086..ffcf8f1c6 100644 --- a/libcef/common/waitable_event_impl.cc +++ b/libcef/common/waitable_event_impl.cc @@ -2,12 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/common/waitable_event_impl.h" - -#include "include/cef_task.h" +#include "cef/libcef/common/waitable_event_impl.h" #include "base/notreached.h" #include "base/time/time.h" +#include "cef/include/cef_task.h" namespace { diff --git a/libcef/common/waitable_event_impl.h b/libcef/common/waitable_event_impl.h index 13b6b0e91..c8a66c1e6 100644 --- a/libcef/common/waitable_event_impl.h +++ b/libcef/common/waitable_event_impl.h @@ -6,9 +6,8 @@ #define CEF_LIBCEF_COMMON_WAITABLE_EVENT_IMPL_H_ #pragma once -#include "include/cef_waitable_event.h" - #include "base/synchronization/waitable_event.h" +#include "cef/include/cef_waitable_event.h" class CefWaitableEventImpl : public CefWaitableEvent { public: diff --git a/libcef/renderer/alloy/alloy_content_renderer_client.cc b/libcef/renderer/alloy/alloy_content_renderer_client.cc index c78dc45c4..291a90750 100644 --- a/libcef/renderer/alloy/alloy_content_renderer_client.cc +++ b/libcef/renderer/alloy/alloy_content_renderer_client.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/alloy/alloy_content_renderer_client.h" +#include "cef/libcef/renderer/alloy/alloy_content_renderer_client.h" #include #include @@ -21,23 +21,6 @@ #endif #endif -#include "libcef/browser/alloy/alloy_content_browser_client.h" -#include "libcef/browser/context.h" -#include "libcef/common/alloy/alloy_content_client.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/extensions/extensions_client.h" -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/common/request_impl.h" -#include "libcef/features/runtime_checks.h" -#include "libcef/renderer/alloy/alloy_render_frame_observer.h" -#include "libcef/renderer/alloy/alloy_render_thread_observer.h" -#include "libcef/renderer/alloy/url_loader_throttle_provider_impl.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/extensions/extensions_renderer_client.h" -#include "libcef/renderer/render_manager.h" -#include "libcef/renderer/thread_util.h" - #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/metrics/user_metrics_action.h" @@ -46,6 +29,22 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" +#include "cef/libcef/browser/alloy/alloy_content_browser_client.h" +#include "cef/libcef/browser/context.h" +#include "cef/libcef/common/alloy/alloy_content_client.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/extensions/extensions_client.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/features/runtime_checks.h" +#include "cef/libcef/renderer/alloy/alloy_render_frame_observer.h" +#include "cef/libcef/renderer/alloy/alloy_render_thread_observer.h" +#include "cef/libcef/renderer/alloy/url_loader_throttle_provider_impl.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/extensions/extensions_renderer_client.h" +#include "cef/libcef/renderer/render_manager.h" +#include "cef/libcef/renderer/thread_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pdf_util.h" #include "chrome/common/url_constants.h" diff --git a/libcef/renderer/alloy/alloy_content_renderer_client.h b/libcef/renderer/alloy/alloy_content_renderer_client.h index 5bf95e150..51e5f3d2c 100644 --- a/libcef/renderer/alloy/alloy_content_renderer_client.h +++ b/libcef/renderer/alloy/alloy_content_renderer_client.h @@ -13,10 +13,9 @@ #include #include -#include "libcef/renderer/browser_impl.h" - #include "base/task/current_thread.h" #include "base/task/single_thread_task_runner.h" +#include "cef/libcef/renderer/browser_impl.h" #include "chrome/common/plugin.mojom.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_thread.h" diff --git a/libcef/renderer/alloy/alloy_render_frame_observer.cc b/libcef/renderer/alloy/alloy_render_frame_observer.cc index 3a198218b..f7257233a 100644 --- a/libcef/renderer/alloy/alloy_render_frame_observer.cc +++ b/libcef/renderer/alloy/alloy_render_frame_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be found // in the LICENSE file. -#include "libcef/renderer/alloy/alloy_render_frame_observer.h" +#include "cef/libcef/renderer/alloy/alloy_render_frame_observer.h" AlloyRenderFrameObserver::AlloyRenderFrameObserver( content::RenderFrame* render_frame) diff --git a/libcef/renderer/alloy/alloy_render_frame_observer.h b/libcef/renderer/alloy/alloy_render_frame_observer.h index 41bc96153..7a565cfed 100644 --- a/libcef/renderer/alloy/alloy_render_frame_observer.h +++ b/libcef/renderer/alloy/alloy_render_frame_observer.h @@ -5,8 +5,7 @@ #ifndef LIBCEF_RENDERER_ALLOY_ALLOY_RENDER_FRAME_OBSERVER_H_ #define LIBCEF_RENDERER_ALLOY_ALLOY_RENDER_FRAME_OBSERVER_H_ -#include "libcef/renderer/render_frame_observer.h" - +#include "cef/libcef/renderer/render_frame_observer.h" #include "services/service_manager/public/cpp/binder_registry.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.cc b/libcef/renderer/alloy/alloy_render_thread_observer.cc index f8ecd431e..f799b1858 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.cc +++ b/libcef/renderer/alloy/alloy_render_thread_observer.cc @@ -3,11 +3,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/alloy/alloy_render_thread_observer.h" - -#include "libcef/common/net/net_resource_provider.h" +#include "cef/libcef/renderer/alloy/alloy_render_thread_observer.h" #include "base/no_destructor.h" +#include "cef/libcef/common/net/net_resource_provider.h" #include "chrome/common/renderer_configuration.mojom.h" #include "net/base/net_module.h" #include "services/service_manager/public/cpp/connector.h" diff --git a/libcef/renderer/alloy/url_loader_throttle_provider_impl.cc b/libcef/renderer/alloy/url_loader_throttle_provider_impl.cc index c1b3472d7..1be1fd7c8 100644 --- a/libcef/renderer/alloy/url_loader_throttle_provider_impl.cc +++ b/libcef/renderer/alloy/url_loader_throttle_provider_impl.cc @@ -2,15 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/alloy/url_loader_throttle_provider_impl.h" - -#include "libcef/common/extensions/extensions_util.h" -#include "libcef/renderer/alloy/alloy_content_renderer_client.h" -#include "libcef/renderer/alloy/alloy_render_thread_observer.h" +#include "cef/libcef/renderer/alloy/url_loader_throttle_provider_impl.h" #include #include "base/feature_list.h" +#include "cef/libcef/common/extensions/extensions_util.h" +#include "cef/libcef/renderer/alloy/alloy_content_renderer_client.h" +#include "cef/libcef/renderer/alloy/alloy_render_thread_observer.h" #include "chrome/common/google_url_loader_throttle.h" #include "components/signin/public/base/signin_buildflags.h" #include "content/public/common/content_features.h" diff --git a/libcef/renderer/blink_glue.cc b/libcef/renderer/blink_glue.cc index 68db7bdee..533c90d5d 100644 --- a/libcef/renderer/blink_glue.cc +++ b/libcef/renderer/blink_glue.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/blink_glue.h" #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h" #include "third_party/blink/public/platform/web_string.h" @@ -13,7 +13,6 @@ #include "third_party/blink/public/web/web_local_frame_client.h" #include "third_party/blink/public/web/web_node.h" #include "third_party/blink/public/web/web_view_client.h" - #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h" #include "third_party/blink/renderer/bindings/core/v8/script_evaluation_result.h" #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h" diff --git a/libcef/renderer/blink_glue.h b/libcef/renderer/blink_glue.h index 8aae6186b..51a3671e1 100644 --- a/libcef/renderer/blink_glue.h +++ b/libcef/renderer/blink_glue.h @@ -11,8 +11,7 @@ #include #include -#include "include/internal/cef_types.h" - +#include "cef/include/internal/cef_types.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h" #include "third_party/blink/public/platform/web_common.h" #include "v8/include/v8.h" diff --git a/libcef/renderer/browser_impl.cc b/libcef/renderer/browser_impl.cc index a20c6c136..b488ed365 100644 --- a/libcef/renderer/browser_impl.cc +++ b/libcef/renderer/browser_impl.cc @@ -3,20 +3,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/browser_impl.h" #include #include #include -#include "libcef/common/app_manager.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/render_frame_util.h" -#include "libcef/renderer/render_manager.h" -#include "libcef/renderer/thread_util.h" - #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/render_frame_util.h" +#include "cef/libcef/renderer/render_manager.h" +#include "cef/libcef/renderer/thread_util.h" #include "content/public/renderer/render_frame.h" #include "content/renderer/document_state.h" #include "content/renderer/navigation_state.h" diff --git a/libcef/renderer/browser_impl.h b/libcef/renderer/browser_impl.h index 87985e969..2e12c7fef 100644 --- a/libcef/renderer/browser_impl.h +++ b/libcef/renderer/browser_impl.h @@ -14,10 +14,9 @@ #include #include -#include "include/cef_browser.h" -#include "include/cef_client.h" -#include "libcef/renderer/frame_impl.h" - +#include "cef/include/cef_browser.h" +#include "cef/include/cef_client.h" +#include "cef/libcef/renderer/frame_impl.h" #include "third_party/blink/public/common/tokens/tokens.h" #include "third_party/blink/public/web/web_view_observer.h" diff --git a/libcef/renderer/chrome/chrome_content_renderer_client_cef.cc b/libcef/renderer/chrome/chrome_content_renderer_client_cef.cc index 6ad0cf061..01decd6a2 100644 --- a/libcef/renderer/chrome/chrome_content_renderer_client_cef.cc +++ b/libcef/renderer/chrome/chrome_content_renderer_client_cef.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/chrome/chrome_content_renderer_client_cef.h" - -#include "libcef/renderer/render_frame_observer.h" -#include "libcef/renderer/render_manager.h" -#include "libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/chrome/chrome_content_renderer_client_cef.h" +#include "cef/libcef/renderer/render_frame_observer.h" +#include "cef/libcef/renderer/render_manager.h" +#include "cef/libcef/renderer/thread_util.h" #include "chrome/renderer/printing/chrome_print_render_frame_helper_delegate.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" diff --git a/libcef/renderer/dom_document_impl.cc b/libcef/renderer/dom_document_impl.cc index 09cc213ca..7f390a754 100644 --- a/libcef/renderer/dom_document_impl.cc +++ b/libcef/renderer/dom_document_impl.cc @@ -2,11 +2,11 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/renderer/dom_document_impl.h" -#include "libcef/renderer/dom_node_impl.h" -#include "libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/dom_document_impl.h" #include "base/logging.h" +#include "cef/libcef/renderer/dom_node_impl.h" +#include "cef/libcef/renderer/thread_util.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/web_document.h" diff --git a/libcef/renderer/dom_document_impl.h b/libcef/renderer/dom_document_impl.h index 87d870169..591b44ee2 100644 --- a/libcef/renderer/dom_document_impl.h +++ b/libcef/renderer/dom_document_impl.h @@ -7,7 +7,8 @@ #pragma once #include -#include "include/cef_dom.h" + +#include "cef/include/cef_dom.h" namespace blink { class WebLocalFrame; diff --git a/libcef/renderer/dom_node_impl.cc b/libcef/renderer/dom_node_impl.cc index ab97ef9a5..7aaf45392 100644 --- a/libcef/renderer/dom_node_impl.cc +++ b/libcef/renderer/dom_node_impl.cc @@ -2,17 +2,16 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "libcef/renderer/dom_node_impl.h" - -#include "libcef/common/tracker.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/dom_document_impl.h" -#include "libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/dom_node_impl.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "cef/libcef/common/tracker.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/dom_document_impl.h" +#include "cef/libcef/renderer/thread_util.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/web/web_document.h" #include "third_party/blink/public/web/web_dom_event.h" diff --git a/libcef/renderer/dom_node_impl.h b/libcef/renderer/dom_node_impl.h index 55116fc2e..b29301502 100644 --- a/libcef/renderer/dom_node_impl.h +++ b/libcef/renderer/dom_node_impl.h @@ -6,7 +6,7 @@ #define CEF_LIBCEF_DOM_NODE_IMPL_H_ #pragma once -#include "include/cef_dom.h" +#include "cef/include/cef_dom.h" #include "third_party/blink/public/web/web_node.h" class CefDOMDocumentImpl; diff --git a/libcef/renderer/extensions/extensions_renderer_api_provider.cc b/libcef/renderer/extensions/extensions_renderer_api_provider.cc index 25bb3a9e0..4c3e87d57 100644 --- a/libcef/renderer/extensions/extensions_renderer_api_provider.cc +++ b/libcef/renderer/extensions/extensions_renderer_api_provider.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/extensions/extensions_renderer_api_provider.h" +#include "cef/libcef/renderer/extensions/extensions_renderer_api_provider.h" #include "extensions/renderer/module_system.h" #include "extensions/renderer/script_context.h" diff --git a/libcef/renderer/extensions/extensions_renderer_api_provider.h b/libcef/renderer/extensions/extensions_renderer_api_provider.h index dd24871ca..e82cfd2a8 100644 --- a/libcef/renderer/extensions/extensions_renderer_api_provider.h +++ b/libcef/renderer/extensions/extensions_renderer_api_provider.h @@ -11,12 +11,11 @@ namespace extensions { // Provides capabilities for the set of extension APIs defined for the // extensions shell. -class CefExtensionsRendererAPIProvider - : public ExtensionsRendererAPIProvider { +class CefExtensionsRendererAPIProvider : public ExtensionsRendererAPIProvider { public: CefExtensionsRendererAPIProvider() = default; - CefExtensionsRendererAPIProvider( - const CefExtensionsRendererAPIProvider&) = delete; + CefExtensionsRendererAPIProvider(const CefExtensionsRendererAPIProvider&) = + delete; CefExtensionsRendererAPIProvider& operator=( const CefExtensionsRendererAPIProvider&) = delete; ~CefExtensionsRendererAPIProvider() override = default; diff --git a/libcef/renderer/extensions/extensions_renderer_client.cc b/libcef/renderer/extensions/extensions_renderer_client.cc index c78a6cad9..56b1d57d3 100644 --- a/libcef/renderer/extensions/extensions_renderer_client.cc +++ b/libcef/renderer/extensions/extensions_renderer_client.cc @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/extensions/extensions_renderer_client.h" - -#include "libcef/renderer/alloy/alloy_content_renderer_client.h" -#include "libcef/renderer/alloy/alloy_render_thread_observer.h" -#include "libcef/renderer/extensions/extensions_renderer_api_provider.h" +#include "cef/libcef/renderer/extensions/extensions_renderer_client.h" #include "base/stl_util.h" +#include "cef/libcef/renderer/alloy/alloy_content_renderer_client.h" +#include "cef/libcef/renderer/alloy/alloy_render_thread_observer.h" +#include "cef/libcef/renderer/extensions/extensions_renderer_api_provider.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/extensions/resource_request_policy.h" #include "content/public/common/content_constants.h" diff --git a/libcef/renderer/frame_impl.cc b/libcef/renderer/frame_impl.cc index 62669fb30..4e7776c7b 100644 --- a/libcef/renderer/frame_impl.cc +++ b/libcef/renderer/frame_impl.cc @@ -2,7 +2,7 @@ // reserved. Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/renderer/frame_impl.h" +#include "cef/libcef/renderer/frame_impl.h" #include "build/build_config.h" @@ -17,23 +17,22 @@ #endif #endif -#include "include/cef_urlrequest.h" -#include "libcef/common/app_manager.h" -#include "libcef/common/frame_util.h" -#include "libcef/common/net/http_header_utils.h" -#include "libcef/common/process_message_impl.h" -#include "libcef/common/process_message_smr_impl.h" -#include "libcef/common/request_impl.h" -#include "libcef/common/string_util.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/dom_document_impl.h" -#include "libcef/renderer/render_frame_util.h" -#include "libcef/renderer/thread_util.h" -#include "libcef/renderer/v8_impl.h" - #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "cef/include/cef_urlrequest.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/common/net/http_header_utils.h" +#include "cef/libcef/common/process_message_impl.h" +#include "cef/libcef/common/process_message_smr_impl.h" +#include "cef/libcef/common/request_impl.h" +#include "cef/libcef/common/string_util.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/dom_document_impl.h" +#include "cef/libcef/renderer/render_frame_util.h" +#include "cef/libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/v8_impl.h" #include "content/renderer/render_frame_impl.h" #include "third_party/blink/public/mojom/frame/frame.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h" diff --git a/libcef/renderer/frame_impl.h b/libcef/renderer/frame_impl.h index 96186e800..e4d2bf6f7 100644 --- a/libcef/renderer/frame_impl.h +++ b/libcef/renderer/frame_impl.h @@ -9,13 +9,12 @@ #include #include -#include "include/cef_frame.h" -#include "include/cef_v8.h" -#include "libcef/renderer/blink_glue.h" - #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" +#include "cef/include/cef_frame.h" +#include "cef/include/cef_v8.h" #include "cef/libcef/common/mojom/cef.mojom.h" +#include "cef/libcef/renderer/blink_glue.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" diff --git a/libcef/renderer/render_frame_observer.cc b/libcef/renderer/render_frame_observer.cc index 1757b3e6d..ff2b3fe31 100644 --- a/libcef/renderer/render_frame_observer.cc +++ b/libcef/renderer/render_frame_observer.cc @@ -15,14 +15,12 @@ #endif #endif -#include "libcef/renderer/render_frame_observer.h" - -#include "libcef/common/app_manager.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/dom_document_impl.h" -#include "libcef/renderer/v8_impl.h" - +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/dom_document_impl.h" +#include "cef/libcef/renderer/render_frame_observer.h" +#include "cef/libcef/renderer/v8_impl.h" #include "content/public/renderer/render_frame.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_document.h" diff --git a/libcef/renderer/render_frame_util.cc b/libcef/renderer/render_frame_util.cc index 1eaa3beb6..0eb417b14 100644 --- a/libcef/renderer/render_frame_util.cc +++ b/libcef/renderer/render_frame_util.cc @@ -3,12 +3,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "libcef/renderer/render_frame_util.h" - -#include "libcef/common/frame_util.h" -#include "libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/render_frame_util.h" #include "base/logging.h" +#include "cef/libcef/common/frame_util.h" +#include "cef/libcef/renderer/blink_glue.h" #include "content/public/renderer/render_thread.h" #include "content/renderer/render_frame_impl.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/libcef/renderer/render_manager.cc b/libcef/renderer/render_manager.cc index 57cd712bb..78f9f2179 100644 --- a/libcef/renderer/render_manager.cc +++ b/libcef/renderer/render_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can // be found in the LICENSE file. -#include "libcef/renderer/render_manager.h" +#include "cef/libcef/renderer/render_manager.h" #include @@ -19,19 +19,18 @@ #endif #endif -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/net/scheme_info.h" -#include "libcef/common/values_impl.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/render_frame_observer.h" -#include "libcef/renderer/thread_util.h" -#include "libcef/renderer/v8_impl.h" - #include "base/command_line.h" #include "base/strings/string_number_conversions.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" #include "cef/libcef/common/mojom/cef.mojom.h" +#include "cef/libcef/common/net/scheme_info.h" +#include "cef/libcef/common/values_impl.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/render_frame_observer.h" +#include "cef/libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/v8_impl.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" diff --git a/libcef/renderer/render_manager.h b/libcef/renderer/render_manager.h index 8589dcaa7..66abb8e29 100644 --- a/libcef/renderer/render_manager.h +++ b/libcef/renderer/render_manager.h @@ -10,8 +10,7 @@ #include #include -#include "include/internal/cef_ptr.h" - +#include "cef/include/internal/cef_ptr.h" #include "cef/libcef/common/mojom/cef.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h" diff --git a/libcef/renderer/thread_util.h b/libcef/renderer/thread_util.h index d293cd304..b6ab56ab1 100644 --- a/libcef/renderer/thread_util.h +++ b/libcef/renderer/thread_util.h @@ -6,10 +6,9 @@ #define CEF_LIBCEF_RENDERER_THREAD_UTIL_H_ #pragma once -#include "libcef/common/task_runner_manager.h" - #include "base/location.h" #include "base/logging.h" +#include "cef/libcef/common/task_runner_manager.h" #include "content/public/renderer/render_thread.h" #define CEF_CURRENTLY_ON_RT() (!!content::RenderThread::Get()) diff --git a/libcef/renderer/v8_impl.cc b/libcef/renderer/v8_impl.cc index 0e2f5c220..0cc0d3ebc 100644 --- a/libcef/renderer/v8_impl.cc +++ b/libcef/renderer/v8_impl.cc @@ -25,21 +25,19 @@ #endif #endif -#include "libcef/renderer/v8_impl.h" - -#include "libcef/common/app_manager.h" -#include "libcef/common/cef_switches.h" -#include "libcef/common/task_runner_impl.h" -#include "libcef/common/tracker.h" -#include "libcef/renderer/blink_glue.h" -#include "libcef/renderer/browser_impl.h" -#include "libcef/renderer/render_frame_util.h" -#include "libcef/renderer/thread_util.h" - #include "base/auto_reset.h" #include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" +#include "cef/libcef/common/app_manager.h" +#include "cef/libcef/common/cef_switches.h" +#include "cef/libcef/common/task_runner_impl.h" +#include "cef/libcef/common/tracker.h" +#include "cef/libcef/renderer/blink_glue.h" +#include "cef/libcef/renderer/browser_impl.h" +#include "cef/libcef/renderer/render_frame_util.h" +#include "cef/libcef/renderer/thread_util.h" +#include "cef/libcef/renderer/v8_impl.h" #include "third_party/abseil-cpp/absl/base/attributes.h" #include "third_party/blink/public/web/blink.h" #include "third_party/blink/public/web/web_frame.h" diff --git a/libcef/renderer/v8_impl.h b/libcef/renderer/v8_impl.h index 1d4157a0a..3ce7a79fd 100644 --- a/libcef/renderer/v8_impl.h +++ b/libcef/renderer/v8_impl.h @@ -8,13 +8,12 @@ #include -#include "include/cef_v8.h" -#include "libcef/common/tracker.h" - #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" +#include "cef/include/cef_v8.h" +#include "cef/libcef/common/tracker.h" #include "v8/include/v8.h" class CefTrackNode; diff --git a/libcef_dll/base/cef_lock.cc b/libcef_dll/base/cef_lock.cc index ea2ba3cfa..887b199b9 100644 --- a/libcef_dll/base/cef_lock.cc +++ b/libcef_dll/base/cef_lock.cc @@ -7,6 +7,7 @@ // real intelligence in the class is in the debugging logic. #include "include/base/cef_lock.h" + #include "include/base/cef_logging.h" #if DCHECK_IS_ON() diff --git a/libcef_dll/base/cef_logging.cc b/libcef_dll/base/cef_logging.cc index d2279ac5e..8368386ad 100644 --- a/libcef_dll/base/cef_logging.cc +++ b/libcef_dll/base/cef_logging.cc @@ -7,6 +7,7 @@ #if defined(OS_WIN) #include + #include #include #elif defined(OS_POSIX) diff --git a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc index 96f293dc8..35ad7c848 100644 --- a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/accessibility_handler_cpptoc.h" + #include "libcef_dll/ctocpp/value_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/app_cpptoc.cc b/libcef_dll/cpptoc/app_cpptoc.cc index a8e9ec77d..a95e96d5c 100644 --- a/libcef_dll/cpptoc/app_cpptoc.cc +++ b/libcef_dll/cpptoc/app_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/app_cpptoc.h" + #include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h" #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h" #include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/audio_handler_cpptoc.cc b/libcef_dll/cpptoc/audio_handler_cpptoc.cc index 2c4844f3d..d6bf1fb82 100644 --- a/libcef_dll/cpptoc/audio_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/audio_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/audio_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.cc b/libcef_dll/cpptoc/auth_callback_cpptoc.cc index e650f67f9..ef7e5e444 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/auth_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc index 867f1815b..449e8129c 100644 --- a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/before_download_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.cc b/libcef_dll/cpptoc/binary_value_cpptoc.cc index 30fb61604..1399e0273 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/binary_value_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/binary_value_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/browser_cpptoc.cc b/libcef_dll/cpptoc/browser_cpptoc.cc index f940d1329..52c8f7f30 100644 --- a/libcef_dll/cpptoc/browser_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/browser_cpptoc.h" + #include "libcef_dll/cpptoc/browser_host_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.cc b/libcef_dll/cpptoc/browser_host_cpptoc.cc index 5e9e04706..1abac8459 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_host_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/browser_host_cpptoc.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/drag_data_cpptoc.h" diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc index 6c8e76cc8..05e124125 100644 --- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/cpptoc/request_context_handler_cpptoc.h" #include "libcef_dll/ctocpp/command_line_ctocpp.h" diff --git a/libcef_dll/cpptoc/callback_cpptoc.cc b/libcef_dll/cpptoc/callback_cpptoc.cc index 551671265..af9044ad6 100644 --- a/libcef_dll/cpptoc/callback_cpptoc.cc +++ b/libcef_dll/cpptoc/callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/client_cpptoc.cc b/libcef_dll/cpptoc/client_cpptoc.cc index 4341d56cb..bb4cf4051 100644 --- a/libcef_dll/cpptoc/client_cpptoc.cc +++ b/libcef_dll/cpptoc/client_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/client_cpptoc.h" + #include "libcef_dll/cpptoc/audio_handler_cpptoc.h" #include "libcef_dll/cpptoc/command_handler_cpptoc.h" #include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/command_handler_cpptoc.cc b/libcef_dll/cpptoc/command_handler_cpptoc.cc index 581774e23..01b199880 100644 --- a/libcef_dll/cpptoc/command_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/command_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/command_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/command_line_cpptoc.cc b/libcef_dll/cpptoc/command_line_cpptoc.cc index effaf891e..9b5e049ae 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.cc +++ b/libcef_dll/cpptoc/command_line_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/command_line_cpptoc.h" + #include "libcef_dll/transfer_util.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/completion_callback_cpptoc.cc b/libcef_dll/cpptoc/completion_callback_cpptoc.cc index 4384fb622..85fa58327 100644 --- a/libcef_dll/cpptoc/completion_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/completion_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc index f8d7fd732..be6ea47f0 100644 --- a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/context_menu_params_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" diff --git a/libcef_dll/cpptoc/context_menu_params_cpptoc.cc b/libcef_dll/cpptoc/context_menu_params_cpptoc.cc index 19af3b5be..4c79a7230 100644 --- a/libcef_dll/cpptoc/context_menu_params_cpptoc.cc +++ b/libcef_dll/cpptoc/context_menu_params_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/context_menu_params_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc index 8044305af..9902c347f 100644 --- a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/cookie_access_filter_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/ctocpp/request_ctocpp.h" diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc index 7f430e348..f0c78fd9a 100644 --- a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/cookie_manager_cpptoc.h" + #include "libcef_dll/ctocpp/completion_callback_ctocpp.h" #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h" #include "libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h" diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc index e954a2b53..962ede2e5 100644 --- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/template_util.h" diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc index 9c8b33acf..ef31000ab 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc index 810ccd8b0..8dd3e6794 100644 --- a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc +++ b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc index ccc409456..9d430ab28 100644 --- a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/dialog_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc index 71d9c2789..f5d1b9e75 100644 --- a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/cpptoc/list_value_cpptoc.h" #include "libcef_dll/cpptoc/value_cpptoc.h" diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.cc b/libcef_dll/cpptoc/display_handler_cpptoc.cc index a22695d52..936bdc130 100644 --- a/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/display_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.cc b/libcef_dll/cpptoc/domdocument_cpptoc.cc index 5c5b986dc..761162a07 100644 --- a/libcef_dll/cpptoc/domdocument_cpptoc.cc +++ b/libcef_dll/cpptoc/domdocument_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/domdocument_cpptoc.h" + #include "libcef_dll/cpptoc/domnode_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/domnode_cpptoc.cc b/libcef_dll/cpptoc/domnode_cpptoc.cc index 268510b75..cff76913f 100644 --- a/libcef_dll/cpptoc/domnode_cpptoc.cc +++ b/libcef_dll/cpptoc/domnode_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/domnode_cpptoc.h" + #include "libcef_dll/cpptoc/domdocument_cpptoc.h" #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/libcef_dll/cpptoc/domvisitor_cpptoc.cc index 4fb478991..acc99ef3f 100644 --- a/libcef_dll/cpptoc/domvisitor_cpptoc.cc +++ b/libcef_dll/cpptoc/domvisitor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/domvisitor_cpptoc.h" + #include "libcef_dll/ctocpp/domdocument_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.cc b/libcef_dll/cpptoc/download_handler_cpptoc.cc index 4ff803d6d..2b1299d54 100644 --- a/libcef_dll/cpptoc/download_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/download_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/download_handler_cpptoc.h" + #include "libcef_dll/ctocpp/before_download_callback_ctocpp.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/download_item_callback_ctocpp.h" diff --git a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc index 58057268d..6f39fd99f 100644 --- a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/download_image_callback_cpptoc.h" + #include "libcef_dll/ctocpp/image_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc index 3bdd12735..9cb752043 100644 --- a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/download_item_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/download_item_cpptoc.cc b/libcef_dll/cpptoc/download_item_cpptoc.cc index 3fd0b9cd9..3b59737e2 100644 --- a/libcef_dll/cpptoc/download_item_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/download_item_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/drag_data_cpptoc.cc b/libcef_dll/cpptoc/drag_data_cpptoc.cc index abe598e15..68acecd0e 100644 --- a/libcef_dll/cpptoc/drag_data_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_data_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/drag_data_cpptoc.h" + #include "libcef_dll/cpptoc/image_cpptoc.h" #include "libcef_dll/cpptoc/stream_writer_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.cc b/libcef_dll/cpptoc/drag_handler_cpptoc.cc index 2b84d5bd5..b8cae17a7 100644 --- a/libcef_dll/cpptoc/drag_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/drag_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/drag_data_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" diff --git a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc index 37c94f62a..75a87963f 100644 --- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/end_tracing_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/extension_cpptoc.cc b/libcef_dll/cpptoc/extension_cpptoc.cc index 34fa43e41..670d7f249 100644 --- a/libcef_dll/cpptoc/extension_cpptoc.cc +++ b/libcef_dll/cpptoc/extension_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/extension_cpptoc.h" + #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/request_context_cpptoc.h" #include "libcef_dll/ctocpp/extension_handler_ctocpp.h" diff --git a/libcef_dll/cpptoc/extension_handler_cpptoc.cc b/libcef_dll/cpptoc/extension_handler_cpptoc.cc index 743a75a5c..b93f09743 100644 --- a/libcef_dll/cpptoc/extension_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/extension_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/extension_handler_cpptoc.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/extension_ctocpp.h" diff --git a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc index 84b57e256..ed67e04d9 100644 --- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/file_dialog_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.cc b/libcef_dll/cpptoc/find_handler_cpptoc.cc index 632a4adc6..561e3f167 100644 --- a/libcef_dll/cpptoc/find_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/find_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/find_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/libcef_dll/cpptoc/focus_handler_cpptoc.cc index ae219e966..d15310163 100644 --- a/libcef_dll/cpptoc/focus_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/focus_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/focus_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/frame_cpptoc.cc b/libcef_dll/cpptoc/frame_cpptoc.cc index f0a7668c0..32cc74f4d 100644 --- a/libcef_dll/cpptoc/frame_cpptoc.cc +++ b/libcef_dll/cpptoc/frame_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/frame_cpptoc.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/process_message_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" diff --git a/libcef_dll/cpptoc/frame_handler_cpptoc.cc b/libcef_dll/cpptoc/frame_handler_cpptoc.cc index 14811e951..db2e936d7 100644 --- a/libcef_dll/cpptoc/frame_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/frame_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/frame_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc index 763d4cf7b..1e5191c8f 100644 --- a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h" + #include "libcef_dll/cpptoc/stream_reader_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/image_cpptoc.cc b/libcef_dll/cpptoc/image_cpptoc.cc index f095b323b..805225e95 100644 --- a/libcef_dll/cpptoc/image_cpptoc.cc +++ b/libcef_dll/cpptoc/image_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/image_cpptoc.h" + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc index 5704fad0b..35a9c0bdb 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc index cded66599..8c43da7ab 100644 --- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc b/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc index 89f1e5df6..e922ed7e4 100644 --- a/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/keyboard_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc index 366b0606d..5bb7578d7 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" diff --git a/libcef_dll/cpptoc/list_value_cpptoc.cc b/libcef_dll/cpptoc/list_value_cpptoc.cc index 64f032c33..23372561f 100644 --- a/libcef_dll/cpptoc/list_value_cpptoc.cc +++ b/libcef_dll/cpptoc/list_value_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/list_value_cpptoc.h" + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/value_cpptoc.h" diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.cc b/libcef_dll/cpptoc/load_handler_cpptoc.cc index 478b1dc3d..9d312c800 100644 --- a/libcef_dll/cpptoc/load_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/load_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/load_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/media_access_callback_cpptoc.cc b/libcef_dll/cpptoc/media_access_callback_cpptoc.cc index 714136348..480aa0988 100644 --- a/libcef_dll/cpptoc/media_access_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_access_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_access_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/media_observer_cpptoc.cc b/libcef_dll/cpptoc/media_observer_cpptoc.cc index 58dafdb82..554998bf0 100644 --- a/libcef_dll/cpptoc/media_observer_cpptoc.cc +++ b/libcef_dll/cpptoc/media_observer_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_observer_cpptoc.h" + #include "libcef_dll/ctocpp/media_route_ctocpp.h" #include "libcef_dll/ctocpp/media_sink_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/media_route_cpptoc.cc b/libcef_dll/cpptoc/media_route_cpptoc.cc index 246c366c5..181206bd5 100644 --- a/libcef_dll/cpptoc/media_route_cpptoc.cc +++ b/libcef_dll/cpptoc/media_route_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_route_cpptoc.h" + #include "libcef_dll/cpptoc/media_sink_cpptoc.h" #include "libcef_dll/cpptoc/media_source_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc index 704aae85c..f4c50a541 100644 --- a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_route_create_callback_cpptoc.h" + #include "libcef_dll/ctocpp/media_route_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/media_router_cpptoc.cc b/libcef_dll/cpptoc/media_router_cpptoc.cc index 26aba5d25..9c29281cd 100644 --- a/libcef_dll/cpptoc/media_router_cpptoc.cc +++ b/libcef_dll/cpptoc/media_router_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_router_cpptoc.h" + #include "libcef_dll/cpptoc/media_sink_cpptoc.h" #include "libcef_dll/cpptoc/media_source_cpptoc.h" #include "libcef_dll/cpptoc/registration_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_sink_cpptoc.cc b/libcef_dll/cpptoc/media_sink_cpptoc.cc index afc6061c5..f1051429d 100644 --- a/libcef_dll/cpptoc/media_sink_cpptoc.cc +++ b/libcef_dll/cpptoc/media_sink_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_sink_cpptoc.h" + #include "libcef_dll/cpptoc/media_source_cpptoc.h" #include "libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc index bb10fda92..0285326a8 100644 --- a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/template_util.h" diff --git a/libcef_dll/cpptoc/media_source_cpptoc.cc b/libcef_dll/cpptoc/media_source_cpptoc.cc index 0ce19741f..98c4b2ebb 100644 --- a/libcef_dll/cpptoc/media_source_cpptoc.cc +++ b/libcef_dll/cpptoc/media_source_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/media_source_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.cc b/libcef_dll/cpptoc/menu_model_cpptoc.cc index e96d09ddb..410929dd9 100644 --- a/libcef_dll/cpptoc/menu_model_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/menu_model_cpptoc.h" + #include "libcef_dll/ctocpp/menu_model_delegate_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc index 197ae0aee..7ee3bd202 100644 --- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/menu_model_delegate_cpptoc.h" + #include "libcef_dll/ctocpp/menu_model_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc index ff6c3ae2e..b5dbaddbe 100644 --- a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/navigation_entry_cpptoc.h" + #include "libcef_dll/cpptoc/sslstatus_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc index 2abf3fcf3..f7114ba66 100644 --- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h" + #include "libcef_dll/ctocpp/navigation_entry_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc index 1bff0aac1..3054530a1 100644 --- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/pdf_print_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.cc b/libcef_dll/cpptoc/permission_handler_cpptoc.cc index bb0e86c7c..90cc73314 100644 --- a/libcef_dll/cpptoc/permission_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/permission_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/permission_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/ctocpp/media_access_callback_ctocpp.h" diff --git a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc index 43dbe6563..84820bb7e 100644 --- a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/post_data_cpptoc.cc b/libcef_dll/cpptoc/post_data_cpptoc.cc index 76c3e76c6..c3a97cfd6 100644 --- a/libcef_dll/cpptoc/post_data_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_cpptoc.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/cpptoc/post_data_cpptoc.h" + #include + #include "libcef_dll/cpptoc/post_data_element_cpptoc.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/preference_manager_cpptoc.cc b/libcef_dll/cpptoc/preference_manager_cpptoc.cc index 01ea35160..75d69783a 100644 --- a/libcef_dll/cpptoc/preference_manager_cpptoc.cc +++ b/libcef_dll/cpptoc/preference_manager_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/preference_manager_cpptoc.h" + #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/request_context_cpptoc.h" #include "libcef_dll/cpptoc/value_cpptoc.h" diff --git a/libcef_dll/cpptoc/preference_registrar_cpptoc.cc b/libcef_dll/cpptoc/preference_registrar_cpptoc.cc index ee869790b..e2f7640ac 100644 --- a/libcef_dll/cpptoc/preference_registrar_cpptoc.cc +++ b/libcef_dll/cpptoc/preference_registrar_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/preference_registrar_cpptoc.h" + #include "libcef_dll/cpptoc/value_cpptoc.h" namespace { diff --git a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc index dde4a582e..6d4716c01 100644 --- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/print_dialog_callback_cpptoc.h" + #include "libcef_dll/cpptoc/print_settings_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.cc b/libcef_dll/cpptoc/print_handler_cpptoc.cc index 51b8caa10..69f206f36 100644 --- a/libcef_dll/cpptoc/print_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/print_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/print_handler_cpptoc.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/print_dialog_callback_ctocpp.h" #include "libcef_dll/ctocpp/print_job_callback_ctocpp.h" diff --git a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc index 6e211d3ae..ff7d74da7 100644 --- a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/print_job_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/print_settings_cpptoc.cc b/libcef_dll/cpptoc/print_settings_cpptoc.cc index 50e4f16f5..9c8dd59d2 100644 --- a/libcef_dll/cpptoc/print_settings_cpptoc.cc +++ b/libcef_dll/cpptoc/print_settings_cpptoc.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/cpptoc/print_settings_cpptoc.h" + #include + #include "libcef_dll/shutdown_checker.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/process_message_cpptoc.cc b/libcef_dll/cpptoc/process_message_cpptoc.cc index 5f7d0a92a..d927c1872 100644 --- a/libcef_dll/cpptoc/process_message_cpptoc.cc +++ b/libcef_dll/cpptoc/process_message_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/process_message_cpptoc.h" + #include "libcef_dll/cpptoc/list_value_cpptoc.h" #include "libcef_dll/cpptoc/shared_memory_region_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.cc b/libcef_dll/cpptoc/read_handler_cpptoc.cc index da91e5b94..8c320dab8 100644 --- a/libcef_dll/cpptoc/read_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/read_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/read_handler_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/registration_cpptoc.cc b/libcef_dll/cpptoc/registration_cpptoc.cc index 29e9b7eb9..9d8947b07 100644 --- a/libcef_dll/cpptoc/registration_cpptoc.cc +++ b/libcef_dll/cpptoc/registration_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/registration_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" // CONSTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.cc b/libcef_dll/cpptoc/render_handler_cpptoc.cc index facc85805..cca2050bb 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/render_handler_cpptoc.h" + #include "libcef_dll/cpptoc/accessibility_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/drag_data_ctocpp.h" diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc index 203529aa4..b7b9bdf63 100644 --- a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h" + #include "libcef_dll/cpptoc/load_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" diff --git a/libcef_dll/cpptoc/request_context_cpptoc.cc b/libcef_dll/cpptoc/request_context_cpptoc.cc index cd6a84cf2..e3fb6563f 100644 --- a/libcef_dll/cpptoc/request_context_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/request_context_cpptoc.h" + #include "libcef_dll/cpptoc/cookie_manager_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/extension_cpptoc.h" diff --git a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc index 4c2606c17..0ce9065b5 100644 --- a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/request_context_handler_cpptoc.h" + #include "libcef_dll/cpptoc/resource_request_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" diff --git a/libcef_dll/cpptoc/request_cpptoc.cc b/libcef_dll/cpptoc/request_cpptoc.cc index c97acaacf..952977380 100644 --- a/libcef_dll/cpptoc/request_cpptoc.cc +++ b/libcef_dll/cpptoc/request_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/request_cpptoc.h" + #include "libcef_dll/cpptoc/post_data_cpptoc.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.cc b/libcef_dll/cpptoc/request_handler_cpptoc.cc index d7e1ae221..224e742be 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/request_handler_cpptoc.h" + #include "libcef_dll/cpptoc/resource_request_handler_cpptoc.h" #include "libcef_dll/ctocpp/auth_callback_ctocpp.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" diff --git a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc index 489d780a1..7c18c8ab5 100644 --- a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resolve_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc index c2c90b709..c0a49f6b3 100644 --- a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_bundle_cpptoc.h" + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc index 947c434eb..d0f33afb0 100644 --- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_handler_cpptoc.cc index 958225e03..84dbb616e 100644 --- a/libcef_dll/cpptoc/resource_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_handler_cpptoc.h" + #include "libcef_dll/ctocpp/callback_ctocpp.h" #include "libcef_dll/ctocpp/request_ctocpp.h" #include "libcef_dll/ctocpp/resource_read_callback_ctocpp.h" diff --git a/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc b/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc index 090fa00d5..ff43d5191 100644 --- a/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_read_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc index c463391c8..688636c6d 100644 --- a/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_request_handler_cpptoc.h" + #include "libcef_dll/cpptoc/cookie_access_filter_cpptoc.h" #include "libcef_dll/cpptoc/resource_handler_cpptoc.h" #include "libcef_dll/cpptoc/response_filter_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc index 8ac59f579..033f6bf2a 100644 --- a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/resource_skip_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/response_cpptoc.cc b/libcef_dll/cpptoc/response_cpptoc.cc index 4ab4d065b..6b43edd75 100644 --- a/libcef_dll/cpptoc/response_cpptoc.cc +++ b/libcef_dll/cpptoc/response_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/response_cpptoc.h" + #include "libcef_dll/transfer_util.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/response_filter_cpptoc.cc b/libcef_dll/cpptoc/response_filter_cpptoc.cc index 94552e1ab..0454bf7e0 100644 --- a/libcef_dll/cpptoc/response_filter_cpptoc.cc +++ b/libcef_dll/cpptoc/response_filter_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/response_filter_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc index 92f5697f7..151538bf8 100644 --- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc index b309a6505..c678571a6 100644 --- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc index 31b24be4d..627316ec4 100644 --- a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc index 17abe9ec1..96e31d9ef 100644 --- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc +++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h" + #include "libcef_dll/cpptoc/resource_handler_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" diff --git a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc index 0b2f961da..55d2452c1 100644 --- a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h" + #include "libcef_dll/cpptoc/x509certificate_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/server_cpptoc.cc b/libcef_dll/cpptoc/server_cpptoc.cc index 2565a9f91..0680144b1 100644 --- a/libcef_dll/cpptoc/server_cpptoc.cc +++ b/libcef_dll/cpptoc/server_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/server_cpptoc.h" + #include "libcef_dll/cpptoc/task_runner_cpptoc.h" #include "libcef_dll/ctocpp/server_handler_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/server_handler_cpptoc.cc b/libcef_dll/cpptoc/server_handler_cpptoc.cc index 5dad46c0d..308a096fa 100644 --- a/libcef_dll/cpptoc/server_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/server_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/server_handler_cpptoc.h" + #include "libcef_dll/ctocpp/callback_ctocpp.h" #include "libcef_dll/ctocpp/request_ctocpp.h" #include "libcef_dll/ctocpp/server_ctocpp.h" diff --git a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc index 85f70854b..b41583b94 100644 --- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/set_cookie_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc index 72c075922..c32a9bfc5 100644 --- a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/shared_memory_region_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc index 2b52c0130..208b9bbb7 100644 --- a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h" + #include "libcef_dll/cpptoc/process_message_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/sslinfo_cpptoc.cc b/libcef_dll/cpptoc/sslinfo_cpptoc.cc index 3b302ce70..75f77c6d5 100644 --- a/libcef_dll/cpptoc/sslinfo_cpptoc.cc +++ b/libcef_dll/cpptoc/sslinfo_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/sslinfo_cpptoc.h" + #include "libcef_dll/cpptoc/x509certificate_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/sslstatus_cpptoc.cc b/libcef_dll/cpptoc/sslstatus_cpptoc.cc index 2ddc7057b..c4d8719fe 100644 --- a/libcef_dll/cpptoc/sslstatus_cpptoc.cc +++ b/libcef_dll/cpptoc/sslstatus_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/sslstatus_cpptoc.h" + #include "libcef_dll/cpptoc/x509certificate_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.cc b/libcef_dll/cpptoc/stream_reader_cpptoc.cc index 3166ef527..1ac4ff713 100644 --- a/libcef_dll/cpptoc/stream_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_reader_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/stream_reader_cpptoc.h" + #include "libcef_dll/ctocpp/read_handler_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.cc b/libcef_dll/cpptoc/stream_writer_cpptoc.cc index 7821befac..f68053c0c 100644 --- a/libcef_dll/cpptoc/stream_writer_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_writer_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/stream_writer_cpptoc.h" + #include "libcef_dll/ctocpp/write_handler_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.cc b/libcef_dll/cpptoc/string_visitor_cpptoc.cc index a8e5fd73d..92718fee0 100644 --- a/libcef_dll/cpptoc/string_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/string_visitor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/string_visitor_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.cc b/libcef_dll/cpptoc/task_runner_cpptoc.cc index 973a7a00f..75f500e0d 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.cc +++ b/libcef_dll/cpptoc/task_runner_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/task_runner_cpptoc.h" + #include "libcef_dll/ctocpp/task_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc index 420c523a1..2e28c0683 100644 --- a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/test_server_connection_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/test/test_server_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_cpptoc.cc index a2be8b2d0..6c0b83e3b 100644 --- a/libcef_dll/cpptoc/test/test_server_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/test_server_cpptoc.h" + #include "libcef_dll/ctocpp/test/test_server_handler_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc index 724dad03e..845ec48d2 100644 --- a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/test_server_handler_cpptoc.h" + #include "libcef_dll/ctocpp/request_ctocpp.h" #include "libcef_dll/ctocpp/test/test_server_connection_ctocpp.h" #include "libcef_dll/ctocpp/test/test_server_ctocpp.h" diff --git a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc index a174b642d..6f17854bf 100644 --- a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/cpptoc/test/translator_test_cpptoc.h" + #include + #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc index 8dc05c627..d4b8fed3a 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc index ff40f5474..fb3c02a52 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc index a724a6700..3a7198143 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc index 6f9936aa4..b9fc7b307 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc index 76fd1cdb4..3931bd1e9 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc index abaa218ef..214fa37ed 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h" namespace { diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc index c6b625561..dbda248ef 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc index 908669746..5ddd69d9d 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h" + #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/thread_cpptoc.cc b/libcef_dll/cpptoc/thread_cpptoc.cc index 830f9414a..77b64d9d2 100644 --- a/libcef_dll/cpptoc/thread_cpptoc.cc +++ b/libcef_dll/cpptoc/thread_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/thread_cpptoc.h" + #include "libcef_dll/cpptoc/task_runner_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/unresponsive_process_callback_cpptoc.cc b/libcef_dll/cpptoc/unresponsive_process_callback_cpptoc.cc index cadbb2893..e1084e42e 100644 --- a/libcef_dll/cpptoc/unresponsive_process_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/unresponsive_process_callback_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/unresponsive_process_callback_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc index 624d3d03a..335da3d21 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h" + #include "libcef_dll/ctocpp/auth_callback_ctocpp.h" #include "libcef_dll/ctocpp/urlrequest_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_cpptoc.cc index 7d59e734d..884ad9a77 100644 --- a/libcef_dll/cpptoc/urlrequest_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/urlrequest_cpptoc.h" + #include "libcef_dll/cpptoc/request_context_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" #include "libcef_dll/cpptoc/response_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/libcef_dll/cpptoc/v8accessor_cpptoc.cc index c8cb48c61..835bf358b 100644 --- a/libcef_dll/cpptoc/v8accessor_cpptoc.cc +++ b/libcef_dll/cpptoc/v8accessor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8accessor_cpptoc.h" + #include "libcef_dll/ctocpp/v8value_ctocpp.h" namespace { diff --git a/libcef_dll/cpptoc/v8context_cpptoc.cc b/libcef_dll/cpptoc/v8context_cpptoc.cc index c697c3a4d..1f7ea32a2 100644 --- a/libcef_dll/cpptoc/v8context_cpptoc.cc +++ b/libcef_dll/cpptoc/v8context_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8context_cpptoc.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/task_runner_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.cc b/libcef_dll/cpptoc/v8handler_cpptoc.cc index 1b2bda3f6..43d63b98c 100644 --- a/libcef_dll/cpptoc/v8handler_cpptoc.cc +++ b/libcef_dll/cpptoc/v8handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8handler_cpptoc.h" + #include "libcef_dll/ctocpp/v8value_ctocpp.h" namespace { diff --git a/libcef_dll/cpptoc/v8interceptor_cpptoc.cc b/libcef_dll/cpptoc/v8interceptor_cpptoc.cc index 2ab35d79f..ff8a182d6 100644 --- a/libcef_dll/cpptoc/v8interceptor_cpptoc.cc +++ b/libcef_dll/cpptoc/v8interceptor_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8interceptor_cpptoc.h" + #include "libcef_dll/ctocpp/v8value_ctocpp.h" namespace { diff --git a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc index 7595c07eb..f76260ea5 100644 --- a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc +++ b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8stack_trace_cpptoc.h" + #include "libcef_dll/cpptoc/v8stack_frame_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/libcef_dll/cpptoc/v8value_cpptoc.cc index 7fbe2988c..ff4ef7b28 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.cc +++ b/libcef_dll/cpptoc/v8value_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/v8value_cpptoc.h" + #include "libcef_dll/cpptoc/v8context_cpptoc.h" #include "libcef_dll/cpptoc/v8exception_cpptoc.h" #include "libcef_dll/ctocpp/base_ref_counted_ctocpp.h" diff --git a/libcef_dll/cpptoc/value_cpptoc.cc b/libcef_dll/cpptoc/value_cpptoc.cc index 6bc2c567a..85841e8a8 100644 --- a/libcef_dll/cpptoc/value_cpptoc.cc +++ b/libcef_dll/cpptoc/value_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/value_cpptoc.h" + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/list_value_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc index 2b8b2a1ac..25d0a098b 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" + #include "libcef_dll/cpptoc/views/fill_layout_cpptoc.h" #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc index 1ee9004d9..33e7b36a3 100644 --- a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/request_context_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc index 1529dd1e1..0d978974e 100644 --- a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" diff --git a/libcef_dll/cpptoc/views/button_cpptoc.cc b/libcef_dll/cpptoc/views/button_cpptoc.cc index bde1d2bb7..913cc5840 100644 --- a/libcef_dll/cpptoc/views/button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/button_cpptoc.h" + #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/label_button_cpptoc.h" #include "libcef_dll/cpptoc/views/menu_button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc index 4552d0787..74271ae4e 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h" + #include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/button_ctocpp.h" #include "libcef_dll/ctocpp/views/view_ctocpp.h" diff --git a/libcef_dll/cpptoc/views/display_cpptoc.cc b/libcef_dll/cpptoc/views/display_cpptoc.cc index 86e50c8f1..d699a7afe 100644 --- a/libcef_dll/cpptoc/views/display_cpptoc.cc +++ b/libcef_dll/cpptoc/views/display_cpptoc.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/cpptoc/views/display_cpptoc.h" + #include + #include "libcef_dll/shutdown_checker.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc index 72630acf1..3307e163b 100644 --- a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/fill_layout_cpptoc.h" + #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/label_button_cpptoc.cc b/libcef_dll/cpptoc/views/label_button_cpptoc.cc index efd956e4e..a2e0b17e4 100644 --- a/libcef_dll/cpptoc/views/label_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/label_button_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/label_button_cpptoc.h" + #include "libcef_dll/cpptoc/image_cpptoc.h" #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/layout_cpptoc.cc b/libcef_dll/cpptoc/views/layout_cpptoc.cc index 92a8ea40f..d87bf8223 100644 --- a/libcef_dll/cpptoc/views/layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/layout_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/layout_cpptoc.h" + #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" #include "libcef_dll/cpptoc/views/fill_layout_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc index eb98eadd1..9567e63b6 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/menu_button_cpptoc.h" + #include "libcef_dll/cpptoc/image_cpptoc.h" #include "libcef_dll/cpptoc/menu_model_cpptoc.h" #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc index 784974654..b51e12413 100644 --- a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h" + #include "libcef_dll/ctocpp/views/button_ctocpp.h" #include "libcef_dll/ctocpp/views/menu_button_ctocpp.h" #include "libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h" diff --git a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc index ff76b1109..2f760faaf 100644 --- a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" // CONSTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc index fa68604ce..e28736d86 100644 --- a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc +++ b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/overlay_controller_cpptoc.h" + #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/cpptoc/views/window_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/panel_cpptoc.cc b/libcef_dll/cpptoc/views/panel_cpptoc.cc index b33066264..7eafceef7 100644 --- a/libcef_dll/cpptoc/views/panel_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/panel_cpptoc.h" + #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc index f4836f2f6..55ca8af31 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h" + #include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/view_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc index b1a2cc8ea..e6a40b855 100644 --- a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/scroll_view_cpptoc.h" + #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/button_cpptoc.h" #include "libcef_dll/cpptoc/views/panel_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/textfield_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_cpptoc.cc index 8b2e6e4aa..85cb9126c 100644 --- a/libcef_dll/cpptoc/views/textfield_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/textfield_cpptoc.h" + #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/button_cpptoc.h" #include "libcef_dll/cpptoc/views/panel_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc index b687b875e..798939d45 100644 --- a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h" + #include "libcef_dll/ctocpp/views/textfield_ctocpp.h" #include "libcef_dll/ctocpp/views/view_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/views/view_cpptoc.cc b/libcef_dll/cpptoc/views/view_cpptoc.cc index 702262e69..26372bf1d 100644 --- a/libcef_dll/cpptoc/views/view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/view_cpptoc.h" + #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/button_cpptoc.h" #include "libcef_dll/cpptoc/views/label_button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc index effd372d8..40c76605c 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" + #include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/window_cpptoc.cc b/libcef_dll/cpptoc/views/window_cpptoc.cc index b828f066d..fe8211718 100644 --- a/libcef_dll/cpptoc/views/window_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/window_cpptoc.h" + #include "libcef_dll/cpptoc/image_cpptoc.h" #include "libcef_dll/cpptoc/menu_model_cpptoc.h" #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc index 1a1ba9ba7..e499e6b14 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h" + #include "libcef_dll/ctocpp/views/view_ctocpp.h" #include "libcef_dll/ctocpp/views/window_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/waitable_event_cpptoc.cc b/libcef_dll/cpptoc/waitable_event_cpptoc.cc index 4c7e076a4..b845fc792 100644 --- a/libcef_dll/cpptoc/waitable_event_cpptoc.cc +++ b/libcef_dll/cpptoc/waitable_event_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/waitable_event_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" // GLOBAL FUNCTIONS - Body may be edited by hand. diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.cc b/libcef_dll/cpptoc/write_handler_cpptoc.cc index a4c2dcf5e..f803e4020 100644 --- a/libcef_dll/cpptoc/write_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/write_handler_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/write_handler_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" namespace { diff --git a/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc b/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc index a080572e9..d8eb86f2d 100644 --- a/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc +++ b/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/x509cert_principal_cpptoc.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/cpptoc/x509certificate_cpptoc.cc b/libcef_dll/cpptoc/x509certificate_cpptoc.cc index 2ee7b4bf9..464849dde 100644 --- a/libcef_dll/cpptoc/x509certificate_cpptoc.cc +++ b/libcef_dll/cpptoc/x509certificate_cpptoc.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/cpptoc/x509certificate_cpptoc.h" + #include + #include "libcef_dll/cpptoc/binary_value_cpptoc.h" #include "libcef_dll/cpptoc/x509cert_principal_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.cc b/libcef_dll/cpptoc/xml_reader_cpptoc.cc index dd2db7d31..3d6623575 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/xml_reader_cpptoc.h" + #include "libcef_dll/cpptoc/stream_reader_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.cc b/libcef_dll/cpptoc/zip_reader_cpptoc.cc index 679b01d44..ee17b3b8c 100644 --- a/libcef_dll/cpptoc/zip_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/zip_reader_cpptoc.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/cpptoc/zip_reader_cpptoc.h" + #include "libcef_dll/cpptoc/stream_reader_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc b/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc index 9dc901088..3ae4efc42 100644 --- a/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/accessibility_handler_ctocpp.h" + #include "libcef_dll/cpptoc/value_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/app_ctocpp.cc b/libcef_dll/ctocpp/app_ctocpp.cc index 317e4933d..2a624add1 100644 --- a/libcef_dll/ctocpp/app_ctocpp.cc +++ b/libcef_dll/ctocpp/app_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/app_ctocpp.h" + #include "libcef_dll/cpptoc/command_line_cpptoc.h" #include "libcef_dll/cpptoc/scheme_registrar_cpptoc.h" #include "libcef_dll/ctocpp/browser_process_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/audio_handler_ctocpp.cc b/libcef_dll/ctocpp/audio_handler_ctocpp.cc index 1bda3d041..769db384d 100644 --- a/libcef_dll/ctocpp/audio_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/audio_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/audio_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/libcef_dll/ctocpp/auth_callback_ctocpp.cc index 68335c737..3b0c19066 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/auth_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc index 0af18d3a5..4ee3c7c3f 100644 --- a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/before_download_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.cc b/libcef_dll/ctocpp/binary_value_ctocpp.cc index 57d53f60b..b7d27c196 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/binary_value_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/binary_value_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/browser_ctocpp.cc b/libcef_dll/ctocpp/browser_ctocpp.cc index 1c97bdd96..52814502a 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/browser_ctocpp.h" + #include "libcef_dll/ctocpp/browser_host_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/libcef_dll/ctocpp/browser_ctocpp.h index 49853efd0..9febc4a67 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.h +++ b/libcef_dll/ctocpp/browser_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_client_capi.h" #include "include/cef_browser.h" diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.cc b/libcef_dll/ctocpp/browser_host_ctocpp.cc index 0eb41592f..2b345023d 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_host_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/browser_host_ctocpp.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h" #include "libcef_dll/cpptoc/download_image_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/libcef_dll/ctocpp/browser_host_ctocpp.h index 23338648f..7c071f418 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.h +++ b/libcef_dll/ctocpp/browser_host_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_client_capi.h" #include "include/cef_browser.h" diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc index 2503bd167..3b7b40ac0 100644 --- a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/browser_process_handler_ctocpp.h" + #include "libcef_dll/cpptoc/command_line_cpptoc.h" #include "libcef_dll/cpptoc/preference_registrar_cpptoc.h" #include "libcef_dll/ctocpp/client_ctocpp.h" diff --git a/libcef_dll/ctocpp/callback_ctocpp.cc b/libcef_dll/ctocpp/callback_ctocpp.cc index 2a6047671..c5fd0476c 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.cc +++ b/libcef_dll/ctocpp/callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/client_ctocpp.cc b/libcef_dll/ctocpp/client_ctocpp.cc index 08851cceb..8ae16b1d1 100644 --- a/libcef_dll/ctocpp/client_ctocpp.cc +++ b/libcef_dll/ctocpp/client_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/client_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/process_message_cpptoc.h" diff --git a/libcef_dll/ctocpp/command_handler_ctocpp.cc b/libcef_dll/ctocpp/command_handler_ctocpp.cc index a1d2fc79d..51ecadfc0 100644 --- a/libcef_dll/ctocpp/command_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/command_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/command_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/command_line_ctocpp.cc b/libcef_dll/ctocpp/command_line_ctocpp.cc index f7e6d6e67..dd926f39b 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/command_line_ctocpp.h" + #include "include/cef_api_hash.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/command_line_ctocpp.h b/libcef_dll/ctocpp/command_line_ctocpp.h index 333ebf9b9..e786dfb9d 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/libcef_dll/ctocpp/command_line_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_command_line_capi.h" #include "include/cef_command_line.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/completion_callback_ctocpp.cc b/libcef_dll/ctocpp/completion_callback_ctocpp.cc index be12dd528..5c286601b 100644 --- a/libcef_dll/ctocpp/completion_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/completion_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/completion_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc index 49ab65417..517ec9598 100644 --- a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/context_menu_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/context_menu_params_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.cc b/libcef_dll/ctocpp/context_menu_params_ctocpp.cc index 4382c89ee..57d69c1ec 100644 --- a/libcef_dll/ctocpp/context_menu_params_ctocpp.cc +++ b/libcef_dll/ctocpp/context_menu_params_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/context_menu_params_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.h b/libcef_dll/ctocpp/context_menu_params_ctocpp.h index eb960d62b..b8f0ac1f8 100644 --- a/libcef_dll/ctocpp/context_menu_params_ctocpp.h +++ b/libcef_dll/ctocpp/context_menu_params_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_context_menu_handler_capi.h" #include "include/cef_context_menu_handler.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc index a72261cbc..0fc7f5322 100644 --- a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/cookie_access_filter_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc index 17ba45fc5..b9cb32014 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/cookie_manager_ctocpp.h" + #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h" #include "libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc index 3f95bad84..6e87e275b 100644 --- a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc index 8f7341f6c..34a514cb7 100644 --- a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc index 3e15a27dc..e9c201f3c 100644 --- a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc +++ b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc index 0cf9a2051..3cdb94b12 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/dialog_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/file_dialog_callback_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.h b/libcef_dll/ctocpp/dialog_handler_ctocpp.h index f78f78993..0df7d03a6 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.h +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_dialog_handler_capi.h" #include "include/cef_dialog_handler.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc index a132f841b..14f16b869 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/ctocpp/list_value_ctocpp.h" #include "libcef_dll/ctocpp/value_ctocpp.h" diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.cc b/libcef_dll/ctocpp/display_handler_ctocpp.cc index fb92b465e..827fefcfa 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/display_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/display_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.h b/libcef_dll/ctocpp/display_handler_ctocpp.h index 7b0a449aa..f7c0cbd0e 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.h +++ b/libcef_dll/ctocpp/display_handler_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_display_handler_capi.h" #include "include/cef_display_handler.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.cc b/libcef_dll/ctocpp/domdocument_ctocpp.cc index dbc1724f7..50dd69353 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.cc +++ b/libcef_dll/ctocpp/domdocument_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/domdocument_ctocpp.h" + #include "libcef_dll/ctocpp/domnode_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/domnode_ctocpp.cc b/libcef_dll/ctocpp/domnode_ctocpp.cc index cc8f3c219..d1a131f60 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.cc +++ b/libcef_dll/ctocpp/domnode_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/domnode_ctocpp.h" + #include "libcef_dll/ctocpp/domdocument_ctocpp.h" #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.cc b/libcef_dll/ctocpp/domvisitor_ctocpp.cc index 2b975908c..6519b81e0 100644 --- a/libcef_dll/ctocpp/domvisitor_ctocpp.cc +++ b/libcef_dll/ctocpp/domvisitor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/domvisitor_ctocpp.h" + #include "libcef_dll/cpptoc/domdocument_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.cc b/libcef_dll/ctocpp/download_handler_ctocpp.cc index f6426ae28..8efd55d27 100644 --- a/libcef_dll/ctocpp/download_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/download_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/download_handler_ctocpp.h" + #include "libcef_dll/cpptoc/before_download_callback_cpptoc.h" #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/download_item_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc index 78df40630..f8be93dcb 100644 --- a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/download_image_callback_ctocpp.h" + #include "libcef_dll/cpptoc/image_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc index a8b30979d..64c1f0318 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/download_item_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/download_item_ctocpp.cc b/libcef_dll/ctocpp/download_item_ctocpp.cc index 1158115b5..b98352e67 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/download_item_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.cc b/libcef_dll/ctocpp/drag_data_ctocpp.cc index 4e00791e2..8427182ab 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_data_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/drag_data_ctocpp.h" + #include "libcef_dll/ctocpp/image_ctocpp.h" #include "libcef_dll/ctocpp/stream_writer_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.h b/libcef_dll/ctocpp/drag_data_ctocpp.h index cf5b16d71..5623773a0 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.h +++ b/libcef_dll/ctocpp/drag_data_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_drag_data_capi.h" #include "include/cef_drag_data.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.cc b/libcef_dll/ctocpp/drag_handler_ctocpp.cc index 3c9de9381..b39fd657e 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/drag_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/drag_data_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.h b/libcef_dll/ctocpp/drag_handler_ctocpp.h index c664720dc..3254f7db6 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.h +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_drag_handler_capi.h" #include "include/cef_drag_handler.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc index 71b8ccbea..484fb0fb6 100644 --- a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/end_tracing_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/extension_ctocpp.cc b/libcef_dll/ctocpp/extension_ctocpp.cc index 28a189b8e..9bb3b0cbe 100644 --- a/libcef_dll/ctocpp/extension_ctocpp.cc +++ b/libcef_dll/ctocpp/extension_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/extension_ctocpp.h" + #include "libcef_dll/cpptoc/extension_handler_cpptoc.h" #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" #include "libcef_dll/ctocpp/request_context_ctocpp.h" diff --git a/libcef_dll/ctocpp/extension_handler_ctocpp.cc b/libcef_dll/ctocpp/extension_handler_ctocpp.cc index a57276f21..01d78fff7 100644 --- a/libcef_dll/ctocpp/extension_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/extension_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/extension_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/extension_cpptoc.h" #include "libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc index 02a36e516..167c2cd1b 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h index 3f8fed4b4..5e4cb4ed1 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_dialog_handler_capi.h" #include "include/cef_dialog_handler.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.cc b/libcef_dll/ctocpp/find_handler_ctocpp.cc index 6fc960f23..0f04c2996 100644 --- a/libcef_dll/ctocpp/find_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/find_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/find_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.cc b/libcef_dll/ctocpp/focus_handler_ctocpp.cc index e8e788f0f..d108ba082 100644 --- a/libcef_dll/ctocpp/focus_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/focus_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/focus_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/frame_ctocpp.cc b/libcef_dll/ctocpp/frame_ctocpp.cc index 7c46100ae..41225e89b 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.cc +++ b/libcef_dll/ctocpp/frame_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/frame_ctocpp.h" + #include "libcef_dll/cpptoc/domvisitor_cpptoc.h" #include "libcef_dll/cpptoc/string_visitor_cpptoc.h" #include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h" diff --git a/libcef_dll/ctocpp/frame_handler_ctocpp.cc b/libcef_dll/ctocpp/frame_handler_ctocpp.cc index 42c0b4080..020475719 100644 --- a/libcef_dll/ctocpp/frame_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/frame_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/frame_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc index 6bece7c58..618f4a275 100644 --- a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h" + #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/image_ctocpp.cc b/libcef_dll/ctocpp/image_ctocpp.cc index a6f8b6146..260ecbd60 100644 --- a/libcef_dll/ctocpp/image_ctocpp.cc +++ b/libcef_dll/ctocpp/image_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/image_ctocpp.h" + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc index 2cbcab219..b64b8d1b4 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc index 039691b78..7e4440706 100644 --- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc b/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc index 124a17c27..e420de456 100644 --- a/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/keyboard_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc index bc1b109b3..49a64030b 100644 --- a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" diff --git a/libcef_dll/ctocpp/list_value_ctocpp.cc b/libcef_dll/ctocpp/list_value_ctocpp.cc index 762ea0974..3c2f71de6 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.cc +++ b/libcef_dll/ctocpp/list_value_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/list_value_ctocpp.h" + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" #include "libcef_dll/ctocpp/value_ctocpp.h" diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.cc b/libcef_dll/ctocpp/load_handler_ctocpp.cc index 5cb7bf0f1..60913c43d 100644 --- a/libcef_dll/ctocpp/load_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/load_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/load_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/media_access_callback_ctocpp.cc b/libcef_dll/ctocpp/media_access_callback_ctocpp.cc index 99bf810f4..17ffb8d28 100644 --- a/libcef_dll/ctocpp/media_access_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_access_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_access_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/media_observer_ctocpp.cc b/libcef_dll/ctocpp/media_observer_ctocpp.cc index 59eff03b3..781d1ee8a 100644 --- a/libcef_dll/ctocpp/media_observer_ctocpp.cc +++ b/libcef_dll/ctocpp/media_observer_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_observer_ctocpp.h" + #include "libcef_dll/cpptoc/media_route_cpptoc.h" #include "libcef_dll/cpptoc/media_sink_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/media_observer_ctocpp.h b/libcef_dll/ctocpp/media_observer_ctocpp.h index 0a1127ee1..f574b740b 100644 --- a/libcef_dll/ctocpp/media_observer_ctocpp.h +++ b/libcef_dll/ctocpp/media_observer_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_media_router_capi.h" #include "include/cef_media_router.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc index a19fc6914..5f21999aa 100644 --- a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_route_create_callback_ctocpp.h" + #include "libcef_dll/cpptoc/media_route_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/media_route_ctocpp.cc b/libcef_dll/ctocpp/media_route_ctocpp.cc index 68866b4ee..2fd0ba14a 100644 --- a/libcef_dll/ctocpp/media_route_ctocpp.cc +++ b/libcef_dll/ctocpp/media_route_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_route_ctocpp.h" + #include "libcef_dll/ctocpp/media_sink_ctocpp.h" #include "libcef_dll/ctocpp/media_source_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/media_router_ctocpp.cc b/libcef_dll/ctocpp/media_router_ctocpp.cc index f11fa9e37..5c8eaa717 100644 --- a/libcef_dll/ctocpp/media_router_ctocpp.cc +++ b/libcef_dll/ctocpp/media_router_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_router_ctocpp.h" + #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" #include "libcef_dll/cpptoc/media_observer_cpptoc.h" #include "libcef_dll/cpptoc/media_route_create_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/media_sink_ctocpp.cc b/libcef_dll/ctocpp/media_sink_ctocpp.cc index ff66885d8..5f69c2228 100644 --- a/libcef_dll/ctocpp/media_sink_ctocpp.cc +++ b/libcef_dll/ctocpp/media_sink_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_sink_ctocpp.h" + #include "libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h" #include "libcef_dll/ctocpp/media_source_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc index cd33a955d..ac0186b8f 100644 --- a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/media_source_ctocpp.cc b/libcef_dll/ctocpp/media_source_ctocpp.cc index 885839037..8b42b889e 100644 --- a/libcef_dll/ctocpp/media_source_ctocpp.cc +++ b/libcef_dll/ctocpp/media_source_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/media_source_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.cc b/libcef_dll/ctocpp/menu_model_ctocpp.cc index 14cf092ec..59e4b54c4 100644 --- a/libcef_dll/ctocpp/menu_model_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/menu_model_ctocpp.h" + #include "libcef_dll/cpptoc/menu_model_delegate_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc index 5e1042380..320e74ab6 100644 --- a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/menu_model_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/menu_model_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc index 58030b0d8..0ea53581e 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/navigation_entry_ctocpp.h" + #include "libcef_dll/ctocpp/sslstatus_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc index 2e0bc21b8..4a029ad0a 100644 --- a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h" + #include "libcef_dll/cpptoc/navigation_entry_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc index 716df7225..1f158c27a 100644 --- a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/pdf_print_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.cc b/libcef_dll/ctocpp/permission_handler_ctocpp.cc index 3a5371d65..7b2280d6d 100644 --- a/libcef_dll/ctocpp/permission_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/permission_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/permission_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/media_access_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc index 005a795a8..32ba107fa 100644 --- a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/post_data_ctocpp.cc b/libcef_dll/ctocpp/post_data_ctocpp.cc index ea1c38b69..d878142d3 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_ctocpp.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/ctocpp/post_data_ctocpp.h" + #include + #include "libcef_dll/ctocpp/post_data_element_ctocpp.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/preference_manager_ctocpp.cc b/libcef_dll/ctocpp/preference_manager_ctocpp.cc index e99f4c720..114fd3a62 100644 --- a/libcef_dll/ctocpp/preference_manager_ctocpp.cc +++ b/libcef_dll/ctocpp/preference_manager_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/preference_manager_ctocpp.h" + #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" #include "libcef_dll/ctocpp/request_context_ctocpp.h" #include "libcef_dll/ctocpp/value_ctocpp.h" diff --git a/libcef_dll/ctocpp/preference_registrar_ctocpp.cc b/libcef_dll/ctocpp/preference_registrar_ctocpp.cc index 80f5fa59a..b9bb30ef5 100644 --- a/libcef_dll/ctocpp/preference_registrar_ctocpp.cc +++ b/libcef_dll/ctocpp/preference_registrar_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/preference_registrar_ctocpp.h" + #include "libcef_dll/ctocpp/value_ctocpp.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc index 9ef23514d..4768205eb 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/print_dialog_callback_ctocpp.h" + #include "libcef_dll/ctocpp/print_settings_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.cc b/libcef_dll/ctocpp/print_handler_ctocpp.cc index 0528d4c33..e07cb8fa4 100644 --- a/libcef_dll/ctocpp/print_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/print_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/print_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/print_dialog_callback_cpptoc.h" #include "libcef_dll/cpptoc/print_job_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc index b99e3bb10..bd0c7b21c 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/print_job_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.cc b/libcef_dll/ctocpp/print_settings_ctocpp.cc index dca09a8ea..f5f42e25f 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.cc +++ b/libcef_dll/ctocpp/print_settings_ctocpp.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/ctocpp/print_settings_ctocpp.h" + #include + #include "libcef_dll/shutdown_checker.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/process_message_ctocpp.cc b/libcef_dll/ctocpp/process_message_ctocpp.cc index f5342da3c..ed3b0fb91 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.cc +++ b/libcef_dll/ctocpp/process_message_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/process_message_ctocpp.h" + #include "libcef_dll/ctocpp/list_value_ctocpp.h" #include "libcef_dll/ctocpp/shared_memory_region_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.cc b/libcef_dll/ctocpp/read_handler_ctocpp.cc index 9e27624bf..a92efdb6d 100644 --- a/libcef_dll/ctocpp/read_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/read_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/read_handler_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/registration_ctocpp.cc b/libcef_dll/ctocpp/registration_ctocpp.cc index 7026f89e8..601f89230 100644 --- a/libcef_dll/ctocpp/registration_ctocpp.cc +++ b/libcef_dll/ctocpp/registration_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/registration_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // CONSTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.cc b/libcef_dll/ctocpp/render_handler_ctocpp.cc index 83786a496..25b861f49 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/render_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/drag_data_cpptoc.h" #include "libcef_dll/ctocpp/accessibility_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc index 4c4f1ca79..1e77122b5 100644 --- a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/render_process_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" #include "libcef_dll/cpptoc/domnode_cpptoc.h" diff --git a/libcef_dll/ctocpp/request_context_ctocpp.cc b/libcef_dll/ctocpp/request_context_ctocpp.cc index fc1244ff1..616a435a9 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/request_context_ctocpp.h" + #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" #include "libcef_dll/cpptoc/extension_handler_cpptoc.h" #include "libcef_dll/cpptoc/request_context_handler_cpptoc.h" diff --git a/libcef_dll/ctocpp/request_context_ctocpp.h b/libcef_dll/ctocpp/request_context_ctocpp.h index 0ad040342..1963232a0 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_request_context_capi.h" #include "include/capi/cef_request_context_handler_capi.h" #include "include/capi/cef_scheme_capi.h" diff --git a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc index caa8954f5..0f19270ab 100644 --- a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/request_context_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/request_context_cpptoc.h" diff --git a/libcef_dll/ctocpp/request_ctocpp.cc b/libcef_dll/ctocpp/request_ctocpp.cc index 8a87d4e63..c7edb3b82 100644 --- a/libcef_dll/ctocpp/request_ctocpp.cc +++ b/libcef_dll/ctocpp/request_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/request_ctocpp.h" + #include "libcef_dll/ctocpp/post_data_ctocpp.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/libcef_dll/ctocpp/request_handler_ctocpp.cc index ebb8bd111..0d91fb302 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/request_handler_ctocpp.h" + #include "libcef_dll/cpptoc/auth_callback_cpptoc.h" #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc index 5955b2c39..bda124267 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resolve_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.h b/libcef_dll/ctocpp/resolve_callback_ctocpp.h index 92154417d..45df3e62d 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_request_context_capi.h" #include "include/capi/cef_request_context_handler_capi.h" #include "include/capi/cef_scheme_capi.h" diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc index b1f1bb226..9e6f9c20d 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_bundle_ctocpp.h" + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc index cf60d5047..1ba95c6e2 100644 --- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_handler_ctocpp.cc index f4995f77a..687670bde 100644 --- a/libcef_dll/ctocpp/resource_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_handler_ctocpp.h" + #include "libcef_dll/cpptoc/callback_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" #include "libcef_dll/cpptoc/resource_read_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc b/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc index b4896a48c..fe69845a9 100644 --- a/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_read_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc index 783483944..7ad3d07e7 100644 --- a/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_request_handler_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/callback_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" diff --git a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc index 3f62e7352..d5fe6cd5d 100644 --- a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/resource_skip_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/response_ctocpp.cc b/libcef_dll/ctocpp/response_ctocpp.cc index 13fcf7d31..6f6af2ce8 100644 --- a/libcef_dll/ctocpp/response_ctocpp.cc +++ b/libcef_dll/ctocpp/response_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/response_ctocpp.h" + #include "libcef_dll/transfer_util.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/response_filter_ctocpp.cc b/libcef_dll/ctocpp/response_filter_ctocpp.cc index 375f6fdb1..c106bdd6f 100644 --- a/libcef_dll/ctocpp/response_filter_ctocpp.cc +++ b/libcef_dll/ctocpp/response_filter_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/response_filter_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc index 89d9704c0..d28c4d6ce 100644 --- a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc index 39b19d9b0..e60e88082 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h index 79bbd9676..abd91164c 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_client_capi.h" #include "include/cef_browser.h" diff --git a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc index c60575cbb..514b7b602 100644 --- a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc index ceea8239f..4de601cf4 100644 --- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc +++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" diff --git a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc index c86f6a9df..a07a8cc5d 100644 --- a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h" + #include "libcef_dll/ctocpp/x509certificate_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/server_ctocpp.cc b/libcef_dll/ctocpp/server_ctocpp.cc index 59e1794c4..59ead0d79 100644 --- a/libcef_dll/ctocpp/server_ctocpp.cc +++ b/libcef_dll/ctocpp/server_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/server_ctocpp.h" + #include "libcef_dll/cpptoc/server_handler_cpptoc.h" #include "libcef_dll/ctocpp/task_runner_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/server_handler_ctocpp.cc b/libcef_dll/ctocpp/server_handler_ctocpp.cc index 55f99b8e4..d521fea4e 100644 --- a/libcef_dll/ctocpp/server_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/server_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/server_handler_ctocpp.h" + #include "libcef_dll/cpptoc/callback_cpptoc.h" #include "libcef_dll/cpptoc/request_cpptoc.h" #include "libcef_dll/cpptoc/server_cpptoc.h" diff --git a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc index 26b45ac37..07076029e 100644 --- a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/set_cookie_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc index 43651afe6..906bdcc67 100644 --- a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/shared_memory_region_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc index 26a2ca7a9..d8898ce0d 100644 --- a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h" + #include "libcef_dll/ctocpp/process_message_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.cc b/libcef_dll/ctocpp/sslinfo_ctocpp.cc index 62524009c..6ba2290bf 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.cc +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/sslinfo_ctocpp.h" + #include "libcef_dll/ctocpp/x509certificate_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/sslstatus_ctocpp.cc b/libcef_dll/ctocpp/sslstatus_ctocpp.cc index 1fa7b8b22..381c21581 100644 --- a/libcef_dll/ctocpp/sslstatus_ctocpp.cc +++ b/libcef_dll/ctocpp/sslstatus_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/sslstatus_ctocpp.h" + #include "libcef_dll/ctocpp/x509certificate_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.cc b/libcef_dll/ctocpp/stream_reader_ctocpp.cc index 5b4435ac4..7fb6a5959 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" + #include "libcef_dll/cpptoc/read_handler_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.cc b/libcef_dll/ctocpp/stream_writer_ctocpp.cc index 37e089af3..5d5adfdd9 100644 --- a/libcef_dll/ctocpp/stream_writer_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_writer_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/stream_writer_ctocpp.h" + #include "libcef_dll/cpptoc/write_handler_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.cc b/libcef_dll/ctocpp/string_visitor_ctocpp.cc index a4590d828..2e1ac44f7 100644 --- a/libcef_dll/ctocpp/string_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/string_visitor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/string_visitor_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.cc b/libcef_dll/ctocpp/task_runner_ctocpp.cc index 1b3df3e00..9b594bf24 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.cc +++ b/libcef_dll/ctocpp/task_runner_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/task_runner_ctocpp.h" + #include "libcef_dll/cpptoc/task_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc index 4ffb07f59..111f59225 100644 --- a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/test_server_connection_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/test/test_server_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_ctocpp.cc index d8a560d89..02b0d3e7e 100644 --- a/libcef_dll/ctocpp/test/test_server_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/test_server_ctocpp.h" + #include "libcef_dll/cpptoc/test/test_server_handler_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc index c4a678204..be9949a9e 100644 --- a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/test_server_handler_ctocpp.h" + #include "libcef_dll/cpptoc/request_cpptoc.h" #include "libcef_dll/cpptoc/test/test_server_connection_cpptoc.h" #include "libcef_dll/cpptoc/test/test_server_cpptoc.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc index 697a786bc..e78010077 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/ctocpp/test/translator_test_ctocpp.h" + #include + #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h" #include "libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ctocpp.h index 7033446d1..4add85688 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h @@ -22,6 +22,7 @@ #include #include + #include "include/capi/test/cef_translator_test_capi.h" #include "include/test/cef_translator_test.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc index bda3ab022..254a01b99 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc index 089407189..0c8805e29 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc index f2eee01e2..2ab5390d3 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc index e86ba54ec..68b15164c 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc index cae43c793..c06e68bef 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h" #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc index e669db38e..fecdc5013 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc index 61eb3f71c..e9a5fbff6 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc index 88ac13aa5..85230c75a 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h" + #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h" #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h" diff --git a/libcef_dll/ctocpp/thread_ctocpp.cc b/libcef_dll/ctocpp/thread_ctocpp.cc index 9548d20ca..02ead1cbf 100644 --- a/libcef_dll/ctocpp/thread_ctocpp.cc +++ b/libcef_dll/ctocpp/thread_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/thread_ctocpp.h" + #include "libcef_dll/ctocpp/task_runner_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/unresponsive_process_callback_ctocpp.cc b/libcef_dll/ctocpp/unresponsive_process_callback_ctocpp.cc index 1c05a841b..d74fa9671 100644 --- a/libcef_dll/ctocpp/unresponsive_process_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/unresponsive_process_callback_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/unresponsive_process_callback_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc index 248d3bd13..549c61a3b 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/urlrequest_client_ctocpp.h" + #include "libcef_dll/cpptoc/auth_callback_cpptoc.h" #include "libcef_dll/cpptoc/urlrequest_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_ctocpp.cc index 0956b79e5..cf0d12944 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/urlrequest_ctocpp.h" + #include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h" #include "libcef_dll/ctocpp/request_context_ctocpp.h" #include "libcef_dll/ctocpp/request_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.cc b/libcef_dll/ctocpp/v8accessor_ctocpp.cc index 935439541..e8a5261f7 100644 --- a/libcef_dll/ctocpp/v8accessor_ctocpp.cc +++ b/libcef_dll/ctocpp/v8accessor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8accessor_ctocpp.h" + #include "libcef_dll/cpptoc/v8value_cpptoc.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/v8context_ctocpp.cc b/libcef_dll/ctocpp/v8context_ctocpp.cc index e4989ddf1..8fc5aa4d9 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.cc +++ b/libcef_dll/ctocpp/v8context_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8context_ctocpp.h" + #include "libcef_dll/ctocpp/browser_ctocpp.h" #include "libcef_dll/ctocpp/frame_ctocpp.h" #include "libcef_dll/ctocpp/task_runner_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.cc b/libcef_dll/ctocpp/v8handler_ctocpp.cc index 4d75084ab..20390d851 100644 --- a/libcef_dll/ctocpp/v8handler_ctocpp.cc +++ b/libcef_dll/ctocpp/v8handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8handler_ctocpp.h" + #include "libcef_dll/cpptoc/v8value_cpptoc.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/v8interceptor_ctocpp.cc b/libcef_dll/ctocpp/v8interceptor_ctocpp.cc index 03533a553..a7186b870 100644 --- a/libcef_dll/ctocpp/v8interceptor_ctocpp.cc +++ b/libcef_dll/ctocpp/v8interceptor_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8interceptor_ctocpp.h" + #include "libcef_dll/cpptoc/v8value_cpptoc.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc index f1941bd2e..378ff5a65 100644 --- a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc +++ b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h" + #include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/libcef_dll/ctocpp/v8value_ctocpp.cc index a0b2438b3..ac8ea227f 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/v8value_ctocpp.h" + #include "libcef_dll/cpptoc/base_ref_counted_cpptoc.h" #include "libcef_dll/cpptoc/v8accessor_cpptoc.h" #include "libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h" diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/libcef_dll/ctocpp/v8value_ctocpp.h index b8ed742d1..ab8305747 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/libcef_dll/ctocpp/v8value_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_v8_capi.h" #include "include/cef_v8.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/value_ctocpp.cc b/libcef_dll/ctocpp/value_ctocpp.cc index 11e9dc975..bc6ecd390 100644 --- a/libcef_dll/ctocpp/value_ctocpp.cc +++ b/libcef_dll/ctocpp/value_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/value_ctocpp.h" + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" #include "libcef_dll/ctocpp/list_value_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc index 6f4e084cd..202c7fffe 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" + #include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h" #include "libcef_dll/ctocpp/views/view_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc index 796fa439c..e5cc33e51 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" + #include "libcef_dll/cpptoc/client_cpptoc.h" #include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" diff --git a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc index 156f5e427..9768e6fba 100644 --- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/browser_cpptoc.h" #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" #include "libcef_dll/cpptoc/views/view_cpptoc.h" diff --git a/libcef_dll/ctocpp/views/button_ctocpp.cc b/libcef_dll/ctocpp/views/button_ctocpp.cc index ff7eadd90..ad121d965 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/button_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" #include "libcef_dll/ctocpp/views/label_button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc index 53855392f..59273114c 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/button_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/button_cpptoc.h" #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/display_ctocpp.cc b/libcef_dll/ctocpp/views/display_ctocpp.cc index 618feab0d..77d522c93 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.cc +++ b/libcef_dll/ctocpp/views/display_ctocpp.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/ctocpp/views/display_ctocpp.h" + #include + #include "libcef_dll/shutdown_checker.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc index a3aaed235..7105c6873 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h" + #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.cc b/libcef_dll/ctocpp/views/label_button_ctocpp.cc index 8af7409f6..9502ed3f5 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/label_button_ctocpp.h" + #include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/image_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.cc b/libcef_dll/ctocpp/views/layout_ctocpp.cc index 112f6eb53..3a9abea38 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/layout_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/layout_ctocpp.h" + #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" #include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc index 2afc7a148..11da87f7a 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/menu_button_ctocpp.h" + #include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/image_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc index 6824b28f7..b9afe3bfe 100644 --- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/button_cpptoc.h" #include "libcef_dll/cpptoc/views/menu_button_cpptoc.h" #include "libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h" diff --git a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc index 618fcc009..bd6bedcd3 100644 --- a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // CONSTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc index d4ef1bd77..94afb2657 100644 --- a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc +++ b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/overlay_controller_ctocpp.h" + #include "libcef_dll/ctocpp/views/view_ctocpp.h" #include "libcef_dll/ctocpp/views/window_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.cc b/libcef_dll/ctocpp/views/panel_ctocpp.cc index c687346f6..eda313246 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/panel_ctocpp.h" + #include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc index 4cd395aa0..29bbbea64 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/panel_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/ctocpp/views/window_delegate_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc index 79304b116..25a85da18 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/scroll_view_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" #include "libcef_dll/ctocpp/views/button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_ctocpp.cc index d2f1eaaf3..bb5229e30 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/textfield_ctocpp.h" + #include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc index be6b60cfc..3f43d9b6b 100644 --- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/textfield_cpptoc.h" #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/views/view_ctocpp.cc b/libcef_dll/ctocpp/views/view_ctocpp.cc index deaf8a7a3..d1bc3e064 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/view_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" #include "libcef_dll/ctocpp/views/button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc index bc1e8627e..0d66ac04e 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/view_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h" #include "libcef_dll/ctocpp/views/button_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/window_ctocpp.cc b/libcef_dll/ctocpp/views/window_ctocpp.cc index a9beb58d0..23b2529fa 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/window_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" #include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h" #include "libcef_dll/ctocpp/image_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/window_ctocpp.h b/libcef_dll/ctocpp/views/window_ctocpp.h index 4ae069218..c077e7139 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/views/cef_browser_view_capi.h" #include "include/capi/views/cef_window_capi.h" #include "include/views/cef_browser_view.h" diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc index a11d68d43..3ffd1f6b3 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/views/window_delegate_ctocpp.h" + #include "libcef_dll/cpptoc/views/view_cpptoc.h" #include "libcef_dll/cpptoc/views/window_cpptoc.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/waitable_event_ctocpp.cc b/libcef_dll/ctocpp/waitable_event_ctocpp.cc index 9c5dc9079..9a06dd5ff 100644 --- a/libcef_dll/ctocpp/waitable_event_ctocpp.cc +++ b/libcef_dll/ctocpp/waitable_event_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/waitable_event_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // STATIC METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.cc b/libcef_dll/ctocpp/write_handler_ctocpp.cc index 03355ff27..07d45187b 100644 --- a/libcef_dll/ctocpp/write_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/write_handler_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/write_handler_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" // VIRTUAL METHODS - Body may be edited by hand. diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc b/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc index 7343b9426..ab91b20cd 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/x509cert_principal_ctocpp.h" + #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h index 268f5cb1d..47ecf3ea4 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h @@ -21,6 +21,7 @@ #endif #include + #include "include/capi/cef_x509_certificate_capi.h" #include "include/cef_x509_certificate.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" diff --git a/libcef_dll/ctocpp/x509certificate_ctocpp.cc b/libcef_dll/ctocpp/x509certificate_ctocpp.cc index bdb3a76fd..ab9b1dc87 100644 --- a/libcef_dll/ctocpp/x509certificate_ctocpp.cc +++ b/libcef_dll/ctocpp/x509certificate_ctocpp.cc @@ -13,7 +13,9 @@ // #include "libcef_dll/ctocpp/x509certificate_ctocpp.h" + #include + #include "libcef_dll/ctocpp/binary_value_ctocpp.h" #include "libcef_dll/ctocpp/x509cert_principal_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/libcef_dll/ctocpp/xml_reader_ctocpp.cc index 180542d16..c7ab23a63 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/xml_reader_ctocpp.h" + #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/libcef_dll/ctocpp/zip_reader_ctocpp.cc index d0b72e089..57083c67c 100644 --- a/libcef_dll/ctocpp/zip_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/zip_reader_ctocpp.cc @@ -13,6 +13,7 @@ // #include "libcef_dll/ctocpp/zip_reader_ctocpp.h" + #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" #include "libcef_dll/shutdown_checker.h" diff --git a/libcef_dll/sandbox/sandbox_mac.mm b/libcef_dll/sandbox/sandbox_mac.mm index f3afaff3e..b8d2602c2 100644 --- a/libcef_dll/sandbox/sandbox_mac.mm +++ b/libcef_dll/sandbox/sandbox_mac.mm @@ -7,9 +7,8 @@ #include -#include "sandbox/mac/seatbelt_exec.h" - #include "include/cef_sandbox_mac.h" +#include "sandbox/mac/seatbelt_exec.h" void* cef_sandbox_initialize(int argc, char** argv) { uint32_t exec_path_size = 0; diff --git a/libcef_dll/sandbox/sandbox_win.cc b/libcef_dll/sandbox/sandbox_win.cc index 52ef04ed2..cb026b293 100644 --- a/libcef_dll/sandbox/sandbox_win.cc +++ b/libcef_dll/sandbox/sandbox_win.cc @@ -2,12 +2,12 @@ // 2011 the Chromium 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 "base/notreached.h" #include "sandbox/win/src/sandbox.h" -#include "sandbox/win/src/sandbox_factory.h" +#include "base/notreached.h" #include "cef/libcef/features/features.h" #include "include/cef_sandbox_win.h" +#include "sandbox/win/src/sandbox_factory.h" namespace { diff --git a/libcef_dll/wrapper/cef_message_router_utils.cc b/libcef_dll/wrapper/cef_message_router_utils.cc index 9fee2a0bc..a7b16557c 100644 --- a/libcef_dll/wrapper/cef_message_router_utils.cc +++ b/libcef_dll/wrapper/cef_message_router_utils.cc @@ -4,10 +4,10 @@ #include "libcef_dll/wrapper/cef_message_router_utils.h" -#include "include/cef_shared_process_message_builder.h" - #include +#include "include/cef_shared_process_message_builder.h" + namespace cef_message_router_utils { namespace { diff --git a/patch/patch.cfg b/patch/patch.cfg index 3cdd03226..27f299b93 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -44,12 +44,6 @@ patches = [ # https://bugs.chromium.org/p/chromium/issues/detail?id=623342 'name': 'runhooks', }, - { - # Don't sort CEF and Chromium header includes into the same block. - # Partially reverts: - # https://chromium-review.googlesource.com/c/chromium/src/+/5197064 - 'name': 'clang_format_includes', - }, { # Support component builds (GN is_component_build=true). # https://github.com/chromiumembedded/cef/issues/1617 diff --git a/patch/patches/clang_format_includes.patch b/patch/patches/clang_format_includes.patch deleted file mode 100644 index eb6ebc479..000000000 --- a/patch/patches/clang_format_includes.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git .clang-format .clang-format -index 87ff0884ee821..5a40766bbe63e 100644 ---- .clang-format -+++ .clang-format -@@ -12,43 +12,6 @@ Standard: Cpp11 - InsertBraces: true - InsertNewlineAtEOF: true - --# Sort #includes by following --# https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes --# --# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeblocks --IncludeBlocks: Regroup --# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includecategories --IncludeCategories: -- # The win32 api has all sorts of implicit include order dependencies :-/ -- # Give a few headers special priorities that make sure they appear before -- # all other headers. -- # Sync this with SerializeIncludes in tools/add_header.py. -- # TODO(crbug.com/329138753): remove include sorting from tools/add_header.py -- # after confirming clang-format sort works well. -- # LINT.IfChange(winheader) -- - Regex: '^' # This has to be before initguid.h. -- Priority: 1 -- - Regex: '^<(initguid|mmdeviceapi|windows|winsock2|ws2tcpip|shobjidl|atlbase|ole2|unknwn|tchar)\.h>' -- Priority: 2 -- # LINT.ThenChange(/tools/add_header.py:winheader) -- # UIAutomation*.h need to be after base/win/atl.h. -- # Note the low priority number. -- - Regex: '^' -- Priority: 6 -- # Other C system headers. -- - Regex: '^<.*\.h>' -- Priority: 3 -- # C++ standard library headers. -- - Regex: '^<.*' -- Priority: 4 -- # Other libraries. -- - Regex: '.*' -- Priority: 5 --# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeismainregex --IncludeIsMainRegex: "\ --(_(32|64|android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?\ --(_(unit|browser|perf)?tests?)?$" -- - # Make sure code like: - # IPC_BEGIN_MESSAGE_MAP() - # IPC_MESSAGE_HANDLER(WidgetHostViewHost_Update, OnUpdate) diff --git a/tests/cefclient/browser/browser_window_osr_gtk.h b/tests/cefclient/browser/browser_window_osr_gtk.h index 18bd38059..f95b74afb 100644 --- a/tests/cefclient/browser/browser_window_osr_gtk.h +++ b/tests/cefclient/browser/browser_window_osr_gtk.h @@ -7,7 +7,6 @@ #pragma once #include "include/base/cef_lock.h" - #include "tests/cefclient/browser/browser_window.h" #include "tests/cefclient/browser/client_handler_osr.h" #include "tests/cefclient/browser/osr_renderer.h" diff --git a/tests/cefclient/browser/browser_window_osr_mac.mm b/tests/cefclient/browser/browser_window_osr_mac.mm index 88cc51ae8..511f0a1e1 100644 --- a/tests/cefclient/browser/browser_window_osr_mac.mm +++ b/tests/cefclient/browser/browser_window_osr_mac.mm @@ -4,6 +4,7 @@ #include "tests/cefclient/browser/browser_window_osr_mac.h" +#import #include #include #import @@ -19,8 +20,6 @@ #include "tests/shared/browser/geometry_util.h" #include "tests/shared/browser/main_message_loop.h" -#import - // Begin disable NSOpenGL deprecation warnings. #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" diff --git a/tests/cefclient/browser/browser_window_std_gtk.cc b/tests/cefclient/browser/browser_window_std_gtk.cc index ae4e8f9d9..5707e8ae4 100644 --- a/tests/cefclient/browser/browser_window_std_gtk.cc +++ b/tests/cefclient/browser/browser_window_std_gtk.cc @@ -4,11 +4,10 @@ #include "tests/cefclient/browser/browser_window_std_gtk.h" +#include #include #include #include - -#include #undef Success // Definition conflicts with cef_message_router.h #undef RootWindow // Definition conflicts with root_window.h diff --git a/tests/cefclient/browser/client_app_delegates_browser.cc b/tests/cefclient/browser/client_app_delegates_browser.cc index 2d6fc64de..c647da419 100644 --- a/tests/cefclient/browser/client_app_delegates_browser.cc +++ b/tests/cefclient/browser/client_app_delegates_browser.cc @@ -2,9 +2,8 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "tests/shared/browser/client_app_browser.h" - #include "tests/cefclient/browser/client_browser.h" +#include "tests/shared/browser/client_app_browser.h" namespace client { diff --git a/tests/cefclient/browser/client_browser.cc b/tests/cefclient/browser/client_browser.cc index 8ffcc5f31..7dfbfe54e 100644 --- a/tests/cefclient/browser/client_browser.cc +++ b/tests/cefclient/browser/client_browser.cc @@ -3,7 +3,6 @@ // can be found in the LICENSE file. #include "tests/cefclient/browser/client_browser.h" -#include "tests/cefclient/browser/main_context.h" #include "include/base/cef_logging.h" #include "include/cef_command_line.h" diff --git a/tests/cefclient/browser/client_handler.cc b/tests/cefclient/browser/client_handler.cc index e28f92745..f53938697 100644 --- a/tests/cefclient/browser/client_handler.cc +++ b/tests/cefclient/browser/client_handler.cc @@ -5,6 +5,7 @@ #include "tests/cefclient/browser/client_handler.h" #include + #include #include #include diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h b/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h index 7fbeaf890..e6daa5944 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_gtk.h @@ -6,10 +6,10 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_MULTITHREADED_GTK_H_ #pragma once -#include - #include +#include + #include "include/base/cef_lock.h" #include "include/base/cef_platform_thread.h" #include "tests/shared/browser/main_message_loop.h" diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_win.h b/tests/cefclient/browser/main_message_loop_multithreaded_win.h index 9cb95fcd2..655cae070 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_win.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.h @@ -7,6 +7,7 @@ #pragma once #include + #include #include "include/base/cef_lock.h" diff --git a/tests/cefclient/browser/osr_accessibility_helper.cc b/tests/cefclient/browser/osr_accessibility_helper.cc index 2b19fc326..baf8c4338 100644 --- a/tests/cefclient/browser/osr_accessibility_helper.cc +++ b/tests/cefclient/browser/osr_accessibility_helper.cc @@ -3,6 +3,7 @@ // governed by a BSD-style license that can be found in the LICENSE file. #include "tests/cefclient/browser/osr_accessibility_helper.h" + #include "tests/cefclient/browser/osr_accessibility_node.h" namespace client { diff --git a/tests/cefclient/browser/osr_accessibility_node_win.cc b/tests/cefclient/browser/osr_accessibility_node_win.cc index e784d88ef..e0db0ff0c 100644 --- a/tests/cefclient/browser/osr_accessibility_node_win.cc +++ b/tests/cefclient/browser/osr_accessibility_node_win.cc @@ -11,7 +11,9 @@ #if defined(CEF_USE_ATL) #include + #include + #include #include "tests/cefclient/browser/osr_accessibility_helper.h" diff --git a/tests/cefclient/browser/osr_ime_handler_win.cc b/tests/cefclient/browser/osr_ime_handler_win.cc index 8b889c4fb..516c64db9 100644 --- a/tests/cefclient/browser/osr_ime_handler_win.cc +++ b/tests/cefclient/browser/osr_ime_handler_win.cc @@ -4,11 +4,12 @@ // Implementation based on ui/base/ime/win/imm32_manager.cc from Chromium. +#include "tests/cefclient/browser/osr_ime_handler_win.h" + #include #include #include "include/base/cef_build.h" -#include "tests/cefclient/browser/osr_ime_handler_win.h" #include "tests/cefclient/browser/resource.h" #include "tests/shared/browser/geometry_util.h" #include "tests/shared/browser/main_message_loop.h" diff --git a/tests/cefclient/browser/osr_ime_handler_win.h b/tests/cefclient/browser/osr_ime_handler_win.h index ca2bf80b1..0afd149ae 100644 --- a/tests/cefclient/browser/osr_ime_handler_win.h +++ b/tests/cefclient/browser/osr_ime_handler_win.h @@ -7,6 +7,7 @@ #pragma once #include + #include #include "include/internal/cef_types_wrappers.h" diff --git a/tests/cefclient/browser/print_handler_gtk.cc b/tests/cefclient/browser/print_handler_gtk.cc index bd924c97a..462a3d3ce 100644 --- a/tests/cefclient/browser/print_handler_gtk.cc +++ b/tests/cefclient/browser/print_handler_gtk.cc @@ -5,17 +5,16 @@ #include "tests/cefclient/browser/print_handler_gtk.h" -#include -#include - #include #include +#include +#include + #include "include/base/cef_callback.h" #include "include/base/cef_logging.h" #include "include/base/cef_macros.h" #include "include/wrapper/cef_helpers.h" - #include "tests/cefclient/browser/root_window.h" #include "tests/cefclient/browser/util_gtk.h" diff --git a/tests/cefclient/browser/root_window.cc b/tests/cefclient/browser/root_window.cc index 677937fb7..6e637cf80 100644 --- a/tests/cefclient/browser/root_window.cc +++ b/tests/cefclient/browser/root_window.cc @@ -5,7 +5,6 @@ #include "tests/cefclient/browser/root_window.h" #include "include/base/cef_callback_helpers.h" - #include "tests/cefclient/browser/main_context.h" #include "tests/cefclient/browser/root_window_manager.h" #include "tests/shared/common/client_switches.h" diff --git a/tests/cefclient/browser/root_window_create.cc b/tests/cefclient/browser/root_window_create.cc index 7d065908c..deb9cccbb 100644 --- a/tests/cefclient/browser/root_window_create.cc +++ b/tests/cefclient/browser/root_window_create.cc @@ -3,7 +3,6 @@ // can be found in the LICENSE file. #include "tests/cefclient/browser/root_window.h" - #include "tests/cefclient/browser/root_window_views.h" #if defined(OS_WIN) diff --git a/tests/cefclient/browser/root_window_gtk.cc b/tests/cefclient/browser/root_window_gtk.cc index 13634c8ea..0a2fa3c89 100644 --- a/tests/cefclient/browser/root_window_gtk.cc +++ b/tests/cefclient/browser/root_window_gtk.cc @@ -4,10 +4,9 @@ #include "tests/cefclient/browser/root_window_gtk.h" +#include #include #include - -#include #undef Success // Definition conflicts with cef_message_router.h #undef RootWindow // Definition conflicts with root_window.h diff --git a/tests/cefclient/browser/root_window_gtk.h b/tests/cefclient/browser/root_window_gtk.h index 59465027a..467972af7 100644 --- a/tests/cefclient/browser/root_window_gtk.h +++ b/tests/cefclient/browser/root_window_gtk.h @@ -7,6 +7,7 @@ #pragma once #include + #include #include diff --git a/tests/cefclient/browser/text_input_client_osr_mac.h b/tests/cefclient/browser/text_input_client_osr_mac.h index def6d5556..8441544ce 100644 --- a/tests/cefclient/browser/text_input_client_osr_mac.h +++ b/tests/cefclient/browser/text_input_client_osr_mac.h @@ -7,6 +7,7 @@ #pragma once #import + #include #include diff --git a/tests/cefclient/browser/text_input_client_osr_mac.mm b/tests/cefclient/browser/text_input_client_osr_mac.mm index 1695b76f6..cf22bca76 100644 --- a/tests/cefclient/browser/text_input_client_osr_mac.mm +++ b/tests/cefclient/browser/text_input_client_osr_mac.mm @@ -6,6 +6,7 @@ // content/browser/renderer_host/render_widget_host_view_mac.mm from Chromium. #include "text_input_client_osr_mac.h" + #include "include/cef_client.h" #define ColorBLACK 0xFF000000 // Same as Blink SKColor. diff --git a/tests/cefclient/browser/views_window_mac.mm b/tests/cefclient/browser/views_window_mac.mm index 936a85c08..ae0daa629 100644 --- a/tests/cefclient/browser/views_window_mac.mm +++ b/tests/cefclient/browser/views_window_mac.mm @@ -21,4 +21,4 @@ void ViewsWindow::NudgeWindow() { } } -} +} // namespace client diff --git a/tests/cefclient/browser/window_test.cc b/tests/cefclient/browser/window_test.cc index 103910d64..ed75da706 100644 --- a/tests/cefclient/browser/window_test.cc +++ b/tests/cefclient/browser/window_test.cc @@ -15,7 +15,6 @@ #include "tests/cefclient/browser/main_context.h" #include "tests/cefclient/browser/test_runner.h" #include "tests/cefclient/browser/window_test_runner.h" - #include "tests/cefclient/browser/window_test_runner_views.h" #if defined(OS_WIN) diff --git a/tests/cefclient/browser/window_test_runner.h b/tests/cefclient/browser/window_test_runner.h index 7f98cda31..eaf71a252 100644 --- a/tests/cefclient/browser/window_test_runner.h +++ b/tests/cefclient/browser/window_test_runner.h @@ -6,10 +6,10 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_RUNNER_H_ #pragma once -#include "include/cef_browser.h" - #include +#include "include/cef_browser.h" + namespace client::window_test { // Implement this interface for different platforms. Methods will be called on diff --git a/tests/cefclient/browser/window_test_runner_views.cc b/tests/cefclient/browser/window_test_runner_views.cc index c3048b146..350e9cf74 100644 --- a/tests/cefclient/browser/window_test_runner_views.cc +++ b/tests/cefclient/browser/window_test_runner_views.cc @@ -8,7 +8,6 @@ #include "include/views/cef_display.h" #include "include/views/cef_window.h" #include "include/wrapper/cef_helpers.h" - #include "tests/cefclient/browser/root_window_views.h" #include "tests/cefclient/browser/views_window.h" diff --git a/tests/cefclient/cefclient_gtk.cc b/tests/cefclient/cefclient_gtk.cc index e88e7e207..1bda0fd5b 100644 --- a/tests/cefclient/cefclient_gtk.cc +++ b/tests/cefclient/cefclient_gtk.cc @@ -2,14 +2,14 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include - #include +#include #undef Success // Definition conflicts with cef_message_router.h #undef RootWindow // Definition conflicts with root_window.h #include #include + #include #include diff --git a/tests/cefclient/cefclient_mac.mm b/tests/cefclient/cefclient_mac.mm index c9a616cc7..a06352bb3 100644 --- a/tests/cefclient/cefclient_mac.mm +++ b/tests/cefclient/cefclient_mac.mm @@ -4,6 +4,7 @@ // found in the LICENSE file. #import + #include "include/cef_app.h" #import "include/cef_application_mac.h" #include "include/cef_command_ids.h" diff --git a/tests/cefclient/renderer/performance_test_tests.cc b/tests/cefclient/renderer/performance_test_tests.cc index 633bc7311..f71aa2577 100644 --- a/tests/cefclient/renderer/performance_test_tests.cc +++ b/tests/cefclient/renderer/performance_test_tests.cc @@ -2,8 +2,9 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_v8.h" #include "tests/cefclient/renderer/performance_test.h" + +#include "include/cef_v8.h" #include "tests/cefclient/renderer/performance_test_setup.h" namespace client::performance_test { diff --git a/tests/cefsimple/simple_handler.h b/tests/cefsimple/simple_handler.h index 2b7bfe192..ea9e344d5 100644 --- a/tests/cefsimple/simple_handler.h +++ b/tests/cefsimple/simple_handler.h @@ -5,10 +5,10 @@ #ifndef CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ #define CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ -#include "include/cef_client.h" - #include +#include "include/cef_client.h" + class SimpleHandler : public CefClient, public CefDisplayHandler, public CefLifeSpanHandler, diff --git a/tests/cefsimple/simple_handler_win.cc b/tests/cefsimple/simple_handler_win.cc index 3811c67a1..f45bfa6c8 100644 --- a/tests/cefsimple/simple_handler_win.cc +++ b/tests/cefsimple/simple_handler_win.cc @@ -5,6 +5,7 @@ #include "tests/cefsimple/simple_handler.h" #include + #include #include "include/cef_browser.h" diff --git a/tests/ceftests/devtools_message_unittest.cc b/tests/ceftests/devtools_message_unittest.cc index 2856342fe..7fbbb1853 100644 --- a/tests/ceftests/devtools_message_unittest.cc +++ b/tests/ceftests/devtools_message_unittest.cc @@ -11,7 +11,6 @@ #include "include/cef_devtools_message_observer.h" #include "include/cef_parser.h" #include "include/wrapper/cef_closure_task.h" - #include "tests/ceftests/test_handler.h" #include "tests/gtest/include/gtest/gtest.h" diff --git a/tests/ceftests/extensions/background_unittest.cc b/tests/ceftests/extensions/background_unittest.cc index a043f1672..2aa2b887d 100644 --- a/tests/ceftests/extensions/background_unittest.cc +++ b/tests/ceftests/extensions/background_unittest.cc @@ -3,7 +3,6 @@ // can be found in the LICENSE file. #include "tests/ceftests/extensions/extension_test_handler.h" - #include "tests/ceftests/test_util.h" #include "tests/shared/browser/client_app_browser.h" #include "tests/shared/browser/extension_util.h" diff --git a/tests/ceftests/extensions/chrome_tabs_unittest.cc b/tests/ceftests/extensions/chrome_tabs_unittest.cc index d2d5f0f7c..3649a442e 100644 --- a/tests/ceftests/extensions/chrome_tabs_unittest.cc +++ b/tests/ceftests/extensions/chrome_tabs_unittest.cc @@ -2,12 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "tests/ceftests/extensions/extension_test_handler.h" - #include #include "include/cef_parser.h" - +#include "tests/ceftests/extensions/extension_test_handler.h" #include "tests/ceftests/test_util.h" #include "tests/shared/browser/extension_util.h" diff --git a/tests/ceftests/extensions/view_unittest.cc b/tests/ceftests/extensions/view_unittest.cc index 4d9c03cb5..23886a133 100644 --- a/tests/ceftests/extensions/view_unittest.cc +++ b/tests/ceftests/extensions/view_unittest.cc @@ -3,7 +3,6 @@ // can be found in the LICENSE file. #include "tests/ceftests/extensions/extension_test_handler.h" - #include "tests/ceftests/test_util.h" #include "tests/shared/browser/extension_util.h" diff --git a/tests/ceftests/file_util_unittest.cc b/tests/ceftests/file_util_unittest.cc index 9a54ba4cf..7f993bb8a 100644 --- a/tests/ceftests/file_util_unittest.cc +++ b/tests/ceftests/file_util_unittest.cc @@ -2,11 +2,12 @@ // 2011 The Chromium 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 "tests/shared/browser/file_util.h" + #include #include "include/wrapper/cef_scoped_temp_dir.h" #include "tests/gtest/include/gtest/gtest.h" -#include "tests/shared/browser/file_util.h" TEST(FileUtil, JoinPath) { // Should return whichever path component is non-empty. diff --git a/tests/ceftests/os_rendering_unittest.cc b/tests/ceftests/os_rendering_unittest.cc index 82ff2914c..81277080a 100644 --- a/tests/ceftests/os_rendering_unittest.cc +++ b/tests/ceftests/os_rendering_unittest.cc @@ -16,6 +16,7 @@ #if defined(OS_MAC) #include // For character codes. + #include "tests/ceftests/os_rendering_unittest_mac.h" #elif defined(OS_LINUX) #include diff --git a/tests/ceftests/os_rendering_unittest_mac.mm b/tests/ceftests/os_rendering_unittest_mac.mm index 6e24dc93d..10b4fc84f 100644 --- a/tests/ceftests/os_rendering_unittest_mac.mm +++ b/tests/ceftests/os_rendering_unittest_mac.mm @@ -2,10 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file. -#import - #include "tests/ceftests/os_rendering_unittest_mac.h" +#import + namespace osr_unittests { CefWindowHandle GetFakeView() { diff --git a/tests/ceftests/osr_display_unittest.cc b/tests/ceftests/osr_display_unittest.cc index c9f5af542..808755b3b 100644 --- a/tests/ceftests/osr_display_unittest.cc +++ b/tests/ceftests/osr_display_unittest.cc @@ -4,7 +4,6 @@ #include "include/base/cef_callback.h" #include "include/wrapper/cef_closure_task.h" - #include "tests/ceftests/routing_test_handler.h" #include "tests/gtest/include/gtest/gtest.h" diff --git a/tests/ceftests/resource_util_win_dir.cc b/tests/ceftests/resource_util_win_dir.cc index 3df18d5e3..86e23c2c3 100644 --- a/tests/ceftests/resource_util_win_dir.cc +++ b/tests/ceftests/resource_util_win_dir.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "tests/shared/browser/resource_util.h" - #include #include "include/internal/cef_string_wrappers.h" +#include "tests/shared/browser/resource_util.h" namespace client { diff --git a/tests/ceftests/routing_test_handler.cc b/tests/ceftests/routing_test_handler.cc index 758e74c9e..66b37829d 100644 --- a/tests/ceftests/routing_test_handler.cc +++ b/tests/ceftests/routing_test_handler.cc @@ -3,6 +3,7 @@ // can be found in the LICENSE file. #include "tests/ceftests/routing_test_handler.h" + #include "tests/shared/renderer/client_app_renderer.h" using client::ClientAppRenderer; diff --git a/tests/ceftests/send_shared_process_message_unittest.cc b/tests/ceftests/send_shared_process_message_unittest.cc index 60973f21f..3888b33ee 100644 --- a/tests/ceftests/send_shared_process_message_unittest.cc +++ b/tests/ceftests/send_shared_process_message_unittest.cc @@ -2,6 +2,8 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. +#include + #include "include/base/cef_callback.h" #include "include/cef_shared_process_message_builder.h" #include "include/cef_task.h" @@ -10,8 +12,6 @@ #include "tests/gtest/include/gtest/gtest.h" #include "tests/shared/renderer/client_app_renderer.h" -#include - using client::ClientAppRenderer; namespace { diff --git a/tests/ceftests/shared_process_message_unittest.cc b/tests/ceftests/shared_process_message_unittest.cc index 7a517ae73..ee77d83dd 100644 --- a/tests/ceftests/shared_process_message_unittest.cc +++ b/tests/ceftests/shared_process_message_unittest.cc @@ -2,13 +2,12 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "include/cef_shared_process_message_builder.h" - -#include "tests/gtest/include/gtest/gtest.h" - #include #include +#include "include/cef_shared_process_message_builder.h" +#include "tests/gtest/include/gtest/gtest.h" + namespace { constexpr bool kTestFlag = true; diff --git a/tests/ceftests/test_server.cc b/tests/ceftests/test_server.cc index f92d0fc2d..1ab52fb75 100644 --- a/tests/ceftests/test_server.cc +++ b/tests/ceftests/test_server.cc @@ -4,10 +4,10 @@ #include "tests/ceftests/test_server.h" -#include "tests/ceftests/test_server_manager.h" - #include +#include "tests/ceftests/test_server_manager.h" + namespace test_server { // Must use a different port than server_unittest.cc. diff --git a/tests/ceftests/test_server_observer.cc b/tests/ceftests/test_server_observer.cc index 9422e40cb..5e3507266 100644 --- a/tests/ceftests/test_server_observer.cc +++ b/tests/ceftests/test_server_observer.cc @@ -2,14 +2,13 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "tests/ceftests/test_server.h" +#include #include "include/wrapper/cef_helpers.h" +#include "tests/ceftests/test_server.h" #include "tests/ceftests/test_server_manager.h" #include "tests/gtest/include/gtest/gtest.h" -#include - namespace test_server { ObserverHelper::ObserverHelper() : weak_ptr_factory_(this) { diff --git a/tests/ceftests/test_server_observer_unittest.cc b/tests/ceftests/test_server_observer_unittest.cc index dca955600..a4604b881 100644 --- a/tests/ceftests/test_server_observer_unittest.cc +++ b/tests/ceftests/test_server_observer_unittest.cc @@ -2,6 +2,8 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. +#include "tests/ceftests/test_server_observer.h" + #include #include "include/cef_command_line.h" @@ -10,7 +12,6 @@ #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_helpers.h" #include "tests/ceftests/test_request.h" -#include "tests/ceftests/test_server_observer.h" #include "tests/ceftests/test_util.h" #include "tests/ceftests/track_callback.h" #include "tests/gtest/include/gtest/gtest.h" diff --git a/tests/ceftests/test_server_runner.cc b/tests/ceftests/test_server_runner.cc index 1980bba20..ae6dc0835 100644 --- a/tests/ceftests/test_server_runner.cc +++ b/tests/ceftests/test_server_runner.cc @@ -4,10 +4,9 @@ #include "tests/ceftests/test_server_runner.h" -#include "tests/shared/common/client_switches.h" - #include "include/base/cef_logging.h" #include "include/cef_command_line.h" +#include "tests/shared/common/client_switches.h" namespace test_server { diff --git a/tests/ceftests/test_server_runner_normal.cc b/tests/ceftests/test_server_runner_normal.cc index cfe40c23e..35f38ffe0 100644 --- a/tests/ceftests/test_server_runner_normal.cc +++ b/tests/ceftests/test_server_runner_normal.cc @@ -2,11 +2,10 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "tests/ceftests/test_server_runner.h" - #include "include/cef_server.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_helpers.h" +#include "tests/ceftests/test_server_runner.h" #include "tests/gtest/include/gtest/gtest.h" namespace test_server { diff --git a/tests/ceftests/views/test_window_delegate.cc b/tests/ceftests/views/test_window_delegate.cc index deb8dc963..7f6f5aeaf 100644 --- a/tests/ceftests/views/test_window_delegate.cc +++ b/tests/ceftests/views/test_window_delegate.cc @@ -14,6 +14,7 @@ #if defined(OS_WIN) #include + #include "tests/shared/browser/geometry_util.h" #include "tests/shared/browser/util_win.h" #endif diff --git a/tests/shared/browser/resource_util.h b/tests/shared/browser/resource_util.h index 0e03eb7b3..cdfc25030 100644 --- a/tests/shared/browser/resource_util.h +++ b/tests/shared/browser/resource_util.h @@ -7,6 +7,7 @@ #pragma once #include + #include "include/cef_image.h" #include "include/cef_stream.h" diff --git a/tests/shared/browser/util_win.h b/tests/shared/browser/util_win.h index a46d77e2a..1723b4da4 100644 --- a/tests/shared/browser/util_win.h +++ b/tests/shared/browser/util_win.h @@ -7,6 +7,7 @@ #pragma once #include + #include #include "include/internal/cef_types_wrappers.h" diff --git a/tests/shared/common/binary_value_utils.h b/tests/shared/common/binary_value_utils.h index 73b04651d..ccfaa56bb 100644 --- a/tests/shared/common/binary_value_utils.h +++ b/tests/shared/common/binary_value_utils.h @@ -9,6 +9,7 @@ #include #include #include + #include "include/cef_values.h" namespace bv_utils { diff --git a/tests/shared/process_helper_mac.cc b/tests/shared/process_helper_mac.cc index cce48e533..89dd74b36 100644 --- a/tests/shared/process_helper_mac.cc +++ b/tests/shared/process_helper_mac.cc @@ -4,7 +4,6 @@ #include "include/cef_app.h" #include "include/wrapper/cef_library_loader.h" - #include "tests/shared/common/client_app_other.h" #include "tests/shared/renderer/client_app_renderer.h" diff --git a/tools/cef_api_hash.py b/tools/cef_api_hash.py index d2de455c0..b036fb961 100644 --- a/tools/cef_api_hash.py +++ b/tools/cef_api_hash.py @@ -60,7 +60,6 @@ class cef_api_hash: # includes_common "cef_api_hash.h", "cef_base.h", - "cef_config.h", "cef_version.h", "internal/cef_export.h", "internal/cef_ptr.h", diff --git a/tools/make_distrib.py b/tools/make_distrib.py index 0de6e5193..d76ca2bbe 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -740,9 +740,10 @@ if mode == 'standard' or mode == 'minimal': ] for include in generated_includes: # Debug and Release build should be the same so grab whichever exists. - src_path = os.path.join(build_dir_release, 'includes', 'include', include) + rel_path = os.path.join('includes', 'cef', 'include', include) + src_path = os.path.join(build_dir_release, rel_path) if not os.path.exists(src_path): - src_path = os.path.join(build_dir_debug, 'includes', 'include', include) + src_path = os.path.join(build_dir_debug, rel_path) if not os.path.exists(src_path): raise Exception('Missing generated header file: %s' % include) copy_file(src_path, os.path.join(include_dir, include), options.quiet)