summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/devtools/BUILD.gn1
-rw-r--r--chrome/browser/extensions/chrome_extension_host_delegate.cc8
-rw-r--r--chrome/chrome_browser.gypi16
-rw-r--r--chrome/chrome_browser_extensions.gypi72
-rw-r--r--chrome/chrome_debugger.gypi1
-rw-r--r--chrome/common/extensions/api/api.gyp1
6 files changed, 53 insertions, 46 deletions
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index 7686363..f7f0a83 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -115,6 +115,7 @@ static_library("devtools") {
"browser_list_tabcontents_provider.cc",
"devtools_file_system_indexer.cc",
"devtools_target_impl.cc",
+ "devtools_ui_bindings.cc",
"devtools_window.cc",
"devtools_window_base.cc",
"remote_debugging_server.cc",
diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.cc b/chrome/browser/extensions/chrome_extension_host_delegate.cc
index 2b23d82..57de140 100644
--- a/chrome/browser/extensions/chrome_extension_host_delegate.cc
+++ b/chrome/browser/extensions/chrome_extension_host_delegate.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/chrome_extension_host_delegate.h"
-#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -13,6 +12,11 @@
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_system.h"
+// TODO(thestig): Remove #ifdefs when extensions is disabled on mobile.
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
+#endif
+
namespace extensions {
ChromeExtensionHostDelegate::ChromeExtensionHostDelegate() {}
@@ -21,7 +25,9 @@ ChromeExtensionHostDelegate::~ChromeExtensionHostDelegate() {}
void ChromeExtensionHostDelegate::OnExtensionHostCreated(
content::WebContents* web_contents) {
+#if defined(ENABLE_EXTENSIONS)
ChromeExtensionWebContentsObserver::CreateForWebContents(web_contents);
+#endif
PrefsTabHelper::CreateForWebContents(web_contents);
}
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4c9b4a5..edd345e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1905,14 +1905,6 @@
'browser/printing/print_job_worker.cc',
'browser/printing/print_job_worker.h',
'browser/printing/print_job_worker_owner.h',
- 'browser/printing/print_preview_context_menu_observer.cc',
- 'browser/printing/print_preview_context_menu_observer.h',
- 'browser/printing/print_preview_data_service.cc',
- 'browser/printing/print_preview_data_service.h',
- 'browser/printing/print_preview_dialog_controller.cc',
- 'browser/printing/print_preview_dialog_controller.h',
- 'browser/printing/print_preview_message_handler.cc',
- 'browser/printing/print_preview_message_handler.h',
'browser/printing/print_view_manager_base.cc',
'browser/printing/print_view_manager_base.h',
'browser/printing/printer_query.cc',
@@ -1940,6 +1932,14 @@
'browser/printing/printer_manager_dialog_win.cc',
'browser/printing/print_error_dialog.cc',
'browser/printing/print_error_dialog.h',
+ 'browser/printing/print_preview_context_menu_observer.cc',
+ 'browser/printing/print_preview_context_menu_observer.h',
+ 'browser/printing/print_preview_data_service.cc',
+ 'browser/printing/print_preview_data_service.h',
+ 'browser/printing/print_preview_dialog_controller.cc',
+ 'browser/printing/print_preview_dialog_controller.h',
+ 'browser/printing/print_preview_message_handler.cc',
+ 'browser/printing/print_preview_message_handler.h',
'browser/printing/print_view_manager.cc',
'browser/printing/print_view_manager.h',
'browser/printing/print_view_manager_observer.h',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 94722f8..0a4bb1a 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -73,40 +73,6 @@
# tests and mocks.
'browser/apps/ephemeral_app_service.cc',
'browser/apps/ephemeral_app_service.h',
- 'browser/extensions/api/content_settings/content_settings_api_constants.cc',
- 'browser/extensions/api/content_settings/content_settings_api_constants.h',
- 'browser/extensions/api/content_settings/content_settings_helpers.cc',
- 'browser/extensions/api/content_settings/content_settings_helpers.h',
- 'browser/extensions/api/content_settings/content_settings_store.cc',
- 'browser/extensions/api/content_settings/content_settings_store.h',
- 'browser/extensions/api/extension_action/extension_action_api.cc',
- 'browser/extensions/api/extension_action/extension_action_api.h',
- 'browser/extensions/api/extension_action/extension_page_actions_api_constants.cc',
- 'browser/extensions/api/extension_action/extension_page_actions_api_constants.h',
- 'browser/extensions/api/messaging/extension_message_port.cc',
- 'browser/extensions/api/messaging/extension_message_port.h',
- 'browser/extensions/api/messaging/incognito_connectability.cc',
- 'browser/extensions/api/messaging/incognito_connectability.h',
- 'browser/extensions/api/messaging/message_property_provider.cc',
- 'browser/extensions/api/messaging/message_property_provider.h',
- 'browser/extensions/api/messaging/message_service.cc',
- 'browser/extensions/api/messaging/message_service.h',
- 'browser/extensions/api/module/module.cc',
- 'browser/extensions/api/module/module.h',
- 'browser/extensions/api/networking_private/networking_private_api.h',
- 'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
- 'browser/extensions/api/networking_private/networking_private_event_router.h',
- 'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
- 'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
- 'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
- 'browser/extensions/api/preference/preference_api.cc',
- 'browser/extensions/api/preference/preference_api.h',
- 'browser/extensions/api/proxy/proxy_api.cc',
- 'browser/extensions/api/proxy/proxy_api.h',
- 'browser/extensions/api/proxy/proxy_api_constants.cc',
- 'browser/extensions/api/proxy/proxy_api_constants.h',
- 'browser/extensions/api/tabs/tabs_constants.cc',
- 'browser/extensions/api/tabs/tabs_constants.h',
'browser/extensions/app_icon_loader.h',
'browser/extensions/app_icon_loader_impl.cc',
'browser/extensions/app_icon_loader_impl.h',
@@ -137,8 +103,6 @@
'browser/extensions/chrome_extension_function.h',
'browser/extensions/chrome_extension_host_delegate.cc',
'browser/extensions/chrome_extension_host_delegate.h',
- 'browser/extensions/chrome_extension_web_contents_observer.cc',
- 'browser/extensions/chrome_extension_web_contents_observer.h',
'browser/extensions/chrome_extensions_browser_client.cc',
'browser/extensions/chrome_extensions_browser_client.h',
'browser/extensions/chrome_notification_observer.cc',
@@ -590,8 +554,14 @@
'browser/extensions/api/commands/commands.h',
'browser/extensions/api/content_settings/content_settings_api.cc',
'browser/extensions/api/content_settings/content_settings_api.h',
+ 'browser/extensions/api/content_settings/content_settings_api_constants.cc',
+ 'browser/extensions/api/content_settings/content_settings_api_constants.h',
+ 'browser/extensions/api/content_settings/content_settings_helpers.cc',
+ 'browser/extensions/api/content_settings/content_settings_helpers.h',
'browser/extensions/api/content_settings/content_settings_service.cc',
'browser/extensions/api/content_settings/content_settings_service.h',
+ 'browser/extensions/api/content_settings/content_settings_store.cc',
+ 'browser/extensions/api/content_settings/content_settings_store.h',
'browser/extensions/api/context_menus/context_menus_api.cc',
'browser/extensions/api/context_menus/context_menus_api.h',
'browser/extensions/api/context_menus/context_menus_api_helpers.cc',
@@ -660,6 +630,10 @@
'browser/extensions/api/downloads_internal/downloads_internal_api.h',
'browser/extensions/api/execute_code_function.cc',
'browser/extensions/api/execute_code_function.h',
+ 'browser/extensions/api/extension_action/extension_action_api.cc',
+ 'browser/extensions/api/extension_action/extension_action_api.h',
+ 'browser/extensions/api/extension_action/extension_page_actions_api_constants.cc',
+ 'browser/extensions/api/extension_action/extension_page_actions_api_constants.h',
'browser/extensions/api/feedback_private/feedback_private_api.cc',
'browser/extensions/api/feedback_private/feedback_private_api.h',
'browser/extensions/api/feedback_private/feedback_service.cc',
@@ -767,6 +741,14 @@
'browser/extensions/api/media_galleries_private/media_galleries_private_api.h',
'browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc',
'browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h',
+ 'browser/extensions/api/messaging/extension_message_port.cc',
+ 'browser/extensions/api/messaging/extension_message_port.h',
+ 'browser/extensions/api/messaging/incognito_connectability.cc',
+ 'browser/extensions/api/messaging/incognito_connectability.h',
+ 'browser/extensions/api/messaging/message_property_provider.cc',
+ 'browser/extensions/api/messaging/message_property_provider.h',
+ 'browser/extensions/api/messaging/message_service.cc',
+ 'browser/extensions/api/messaging/message_service.h',
'browser/extensions/api/messaging/native_message_port.cc',
'browser/extensions/api/messaging/native_message_port.h',
'browser/extensions/api/messaging/native_message_process_host.cc',
@@ -781,6 +763,8 @@
'browser/extensions/api/messaging/native_process_launcher_win.cc',
'browser/extensions/api/metrics_private/metrics_private_api.cc',
'browser/extensions/api/metrics_private/metrics_private_api.h',
+ 'browser/extensions/api/module/module.cc',
+ 'browser/extensions/api/module/module.h',
'browser/extensions/api/music_manager_private/device_id.cc',
'browser/extensions/api/music_manager_private/device_id.h',
'browser/extensions/api/music_manager_private/device_id_chromeos.cc',
@@ -789,6 +773,12 @@
'browser/extensions/api/music_manager_private/device_id_win.cc',
'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
'browser/extensions/api/music_manager_private/music_manager_private_api.h',
+ 'browser/extensions/api/networking_private/networking_private_api.h',
+ 'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
+ 'browser/extensions/api/networking_private/networking_private_event_router.h',
+ 'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
+ 'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+ 'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
'browser/extensions/api/notifications/notifications_api.cc',
'browser/extensions/api/notifications/notifications_api.h',
'browser/extensions/api/omnibox/omnibox_api.cc',
@@ -803,6 +793,8 @@
'browser/extensions/api/preference/chrome_direct_setting.h',
'browser/extensions/api/preference/chrome_direct_setting_api.cc',
'browser/extensions/api/preference/chrome_direct_setting_api.h',
+ 'browser/extensions/api/preference/preference_api.cc',
+ 'browser/extensions/api/preference/preference_api.h',
'browser/extensions/api/preference/preference_api_constants.cc',
'browser/extensions/api/preference/preference_api_constants.h',
'browser/extensions/api/preference/preference_helpers.cc',
@@ -815,6 +807,10 @@
'browser/extensions/api/processes/processes_api.h',
'browser/extensions/api/processes/processes_api_constants.cc',
'browser/extensions/api/processes/processes_api_constants.h',
+ 'browser/extensions/api/proxy/proxy_api.cc',
+ 'browser/extensions/api/proxy/proxy_api.h',
+ 'browser/extensions/api/proxy/proxy_api_constants.cc',
+ 'browser/extensions/api/proxy/proxy_api_constants.h',
'browser/extensions/api/proxy/proxy_api_helpers.cc',
'browser/extensions/api/proxy/proxy_api_helpers.h',
'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc',
@@ -917,6 +913,8 @@
'browser/extensions/api/tab_capture/tab_capture_registry.h',
'browser/extensions/api/tabs/tabs_api.cc',
'browser/extensions/api/tabs/tabs_api.h',
+ 'browser/extensions/api/tabs/tabs_constants.cc',
+ 'browser/extensions/api/tabs/tabs_constants.h',
'browser/extensions/api/tabs/tabs_event_router.cc',
'browser/extensions/api/tabs/tabs_event_router.h',
'browser/extensions/api/tabs/tabs_windows_api.cc',
@@ -960,6 +958,8 @@
'browser/extensions/api/webstore_private/webstore_private_api.h',
'browser/extensions/browser_context_keyed_service_factories.cc',
'browser/extensions/browser_context_keyed_service_factories.h',
+ 'browser/extensions/chrome_extension_web_contents_observer.cc',
+ 'browser/extensions/chrome_extension_web_contents_observer.h',
'browser/extensions/extension_context_menu_model.cc',
'browser/extensions/extension_context_menu_model.h',
'browser/extensions/extension_error_ui_default.cc',
diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
index b105718..8a5119c 100644
--- a/chrome/chrome_debugger.gypi
+++ b/chrome/chrome_debugger.gypi
@@ -103,6 +103,7 @@
'browser/devtools/browser_list_tabcontents_provider.cc',
'browser/devtools/devtools_file_system_indexer.cc',
'browser/devtools/devtools_target_impl.cc',
+ 'browser/devtools/devtools_ui_bindings.cc',
'browser/devtools/devtools_window.cc',
'browser/devtools/devtools_window_base.cc',
'browser/devtools/remote_debugging_server.cc',
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 4d3ea1b..884f0cb 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -15,7 +15,6 @@
# These duplicate other lists and are the only ones used on Android. They
# should be eliminated. See crbug.com/305852.
'android_schema_files': [
- 'file_system.idl',
'manifest_types.json',
],
generated by cgit v1.1 at 2025-02-11 21:57:15 +0000