Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3525)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 8713006: Revert "Reland "Move a bunch of ChromeOS APIs out of chrome/browser/extensions.""" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/downloads_dom_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e4307bbd83c184e240e9a3a335eecb28aef34316..22ec93e7565543c7307b942c6634bab168bd816c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -460,24 +460,12 @@
'browser/chromeos/drop_shadow_label.cc',
'browser/chromeos/enterprise_extension_observer.cc',
'browser/chromeos/enterprise_extension_observer.h',
- 'browser/chromeos/extensions/get_chromeos_info_extension_api.cc',
- 'browser/chromeos/extensions/get_chromeos_info_extension_api.h',
'browser/chromeos/extensions/file_browser_event_router.cc',
'browser/chromeos/extensions/file_browser_event_router.h',
- 'browser/chromeos/extensions/file_browser_extension_api.cc',
- 'browser/chromeos/extensions/file_browser_extension_api.h',
'browser/chromeos/extensions/file_browser_notifications.cc',
'browser/chromeos/extensions/file_browser_notifications.h',
- 'browser/chromeos/extensions/file_manager_util.cc',
- 'browser/chromeos/extensions/file_manager_util.h',
- 'browser/chromeos/extensions/input_ime_extension_api.cc',
- 'browser/chromeos/extensions/input_ime_extension_api.h',
- 'browser/chromeos/extensions/input_method_extension_api.cc',
- 'browser/chromeos/extensions/input_method_extension_api.h',
'browser/chromeos/extensions/input_method_event_router.cc',
'browser/chromeos/extensions/input_method_event_router.h',
- 'browser/chromeos/extensions/media_player_extension_api.cc',
- 'browser/chromeos/extensions/media_player_extension_api.h',
'browser/chromeos/extensions/media_player_event_router.cc',
'browser/chromeos/extensions/media_player_event_router.h',
'browser/chromeos/external_metrics.cc',
@@ -1015,6 +1003,8 @@
'browser/extensions/extension_event_router.h',
'browser/extensions/extension_event_router_forwarder.cc',
'browser/extensions/extension_event_router_forwarder.h',
+ 'browser/extensions/extension_file_browser_private_api.cc',
+ 'browser/extensions/extension_file_browser_private_api.h',
'browser/extensions/extension_function.cc',
'browser/extensions/extension_function.h',
'browser/extensions/extension_function_dispatcher.cc',
@@ -1037,10 +1027,16 @@
'browser/extensions/extension_idle_api_constants.h',
'browser/extensions/extension_info_map.cc',
'browser/extensions/extension_info_map.h',
+ 'browser/extensions/extension_info_private_api_chromeos.cc',
+ 'browser/extensions/extension_info_private_api_chromeos.h',
'browser/extensions/extension_infobar_delegate.cc',
'browser/extensions/extension_infobar_delegate.h',
'browser/extensions/extension_input_api.cc',
'browser/extensions/extension_input_api.h',
+ 'browser/extensions/extension_input_ime_api.cc',
+ 'browser/extensions/extension_input_ime_api.h',
+ 'browser/extensions/extension_input_method_api.cc',
+ 'browser/extensions/extension_input_method_api.h',
'browser/extensions/extension_input_module_constants.cc',
'browser/extensions/extension_input_module_constants.h',
'browser/extensions/extension_input_ui_api.cc',
@@ -1053,6 +1049,8 @@
'browser/extensions/extension_management_api.h',
'browser/extensions/extension_management_api_constants.cc',
'browser/extensions/extension_management_api_constants.h',
+ 'browser/extensions/extension_mediaplayer_private_api.cc',
+ 'browser/extensions/extension_mediaplayer_private_api.h',
'browser/extensions/extension_menu_manager.cc',
'browser/extensions/extension_menu_manager.h',
'browser/extensions/extension_message_handler.cc',
@@ -1179,6 +1177,8 @@
'browser/extensions/external_pref_extension_loader.h',
'browser/extensions/external_registry_extension_loader_win.cc',
'browser/extensions/external_registry_extension_loader_win.h',
+ 'browser/extensions/file_manager_util.cc',
+ 'browser/extensions/file_manager_util.h',
'browser/extensions/file_reader.cc',
'browser/extensions/file_reader.h',
'browser/extensions/image_loading_tracker.cc',
@@ -4047,10 +4047,10 @@
['exclude', '^browser/chromeos'],
['exclude', '^browser/ui/webui/chromeos'],
['exclude', '^browser/ui/webui/options/chromeos'],
- ['exclude', 'browser/chromeos/extensions/input_ime_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/input_ime_extension_api.h'],
- ['exclude', 'browser/chromeos/extensions/input_method_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/input_method_extension_api.h'],
+ ['exclude', 'browser/extensions/extension_input_ime_api.cc'],
+ ['exclude', 'browser/extensions/extension_input_ime_api.h'],
+ ['exclude', 'browser/extensions/extension_input_method_api.cc'],
+ ['exclude', 'browser/extensions/extension_input_method_api.h'],
['exclude', 'browser/extensions/extension_input_ui_api.cc'],
['exclude', 'browser/extensions/extension_input_ui_api.h'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
@@ -4106,12 +4106,12 @@
}],
['file_manager_extension==0', {
'sources/': [
- ['exclude', 'browser/chromeos/extensions/file_browser_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/file_browser_extension_api.h'],
- ['exclude', 'browser/chromeos/extensions/file_manager_util.h'],
- ['exclude', 'browser/chromeos/extensions/file_manager_util.cc'],
- ['exclude', 'browser/chromeos/extensions/media_player_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/media_player_extension_api.h'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
+ ['exclude', 'browser/extensions/file_manager_util.h'],
+ ['exclude', 'browser/extensions/file_manager_util.cc'],
],
}],
['use_ibus==1', {
@@ -4950,7 +4950,7 @@
# non-ChromeOS views Linux builds.
['OS=="linux" and toolkit_views==1 and chromeos==0', {
'sources/': [
- ['exclude', '^browser/chromeos/extensions/file_browser_extension_api'],
+ ['exclude', '^browser/extensions/extension_file_browser_private_api'],
['include', '^browser/ui/gtk/select_file_dialog_impl.cc'],
['include', '^browser/ui/gtk/select_file_dialog_impl.h'],
['include', '^browser/ui/gtk/select_file_dialog_impl_gtk.cc'],
@@ -4988,12 +4988,12 @@
# (Required because of the '^browser/extensions/' include above)
['file_manager_extension==0', {
'sources/': [
- ['exclude', 'browser/chromeos/extensions/file_browser_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/file_browser_extension_api.h'],
- ['exclude', 'browser/chromeos/extensions/file_manager_util.h'],
- ['exclude', 'browser/chromeos/extensions/file_manager_util.cc'],
- ['exclude', 'browser/chromeos/extensions/media_player_extension_api.cc'],
- ['exclude', 'browser/chromeos/extensions/media_player_extension_api.h'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
+ ['exclude', 'browser/extensions/file_manager_util.h'],
+ ['exclude', 'browser/extensions/file_manager_util.cc'],
],
}],
# GTK build only
@@ -5125,7 +5125,6 @@
['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
['include', '^browser/ui/views/native_constrained_window_aura.cc'],
- ['include', '^browser/ui/views/select_file_dialog_aura.cc'],
['include', '^browser/ui/views/stubs_aura.cc'],
],
}],
« no previous file with comments | « chrome/browser/ui/webui/downloads_dom_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698