Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 1f171e635082fca9d9c31835547f7994c73547ef..a78b4a07077c25d5a672f4b91a9b2a0199cbce0b 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -455,12 +455,24 @@ |
'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', |
@@ -998,8 +1010,6 @@ |
'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', |
@@ -1022,16 +1032,10 @@ |
'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', |
@@ -1044,8 +1048,6 @@ |
'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', |
@@ -1172,8 +1174,6 @@ |
'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', |
@@ -4042,10 +4042,10 @@ |
['exclude', '^browser/chromeos'], |
['exclude', '^browser/ui/webui/chromeos'], |
['exclude', '^browser/ui/webui/options/chromeos'], |
- ['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/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_ui_api.cc'], |
['exclude', 'browser/extensions/extension_input_ui_api.h'], |
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'], |
@@ -4101,12 +4101,12 @@ |
}], |
['file_manager_extension==0', { |
'sources/': [ |
- ['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'], |
+ ['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'], |
], |
}], |
['use_ibus==1', { |
@@ -4961,7 +4961,7 @@ |
# non-ChromeOS views Linux builds. |
['OS=="linux" and toolkit_views==1 and chromeos==0', { |
'sources/': [ |
- ['exclude', '^browser/extensions/extension_file_browser_private_api'], |
+ ['exclude', '^browser/chromeos/extensions/file_browser_extension_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'], |
@@ -4999,12 +4999,12 @@ |
# (Required because of the '^browser/extensions/' include above) |
['file_manager_extension==0', { |
'sources/': [ |
- ['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'], |
+ ['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'], |
], |
}], |
# GTK build only |