Revert "Move a bunch of ChromeOS APIs out of chrome/browser/extensions."

chrome/chrome_browser.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 440 matching lines @@
         'browser/chromeos/dbus/session_manager_client.h',
         'browser/chromeos/dbus/speech_synthesizer_client.cc',
         'browser/chromeos/dbus/speech_synthesizer_client.h',
         'browser/chromeos/dbus/update_engine_client.cc',
         'browser/chromeos/dbus/update_engine_client.h',
         'browser/chromeos/disks/disk_mount_manager.cc',
         'browser/chromeos/disks/disk_mount_manager.h',
         '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',
         'browser/chromeos/external_metrics.h',
         'browser/chromeos/external_protocol_dialog.cc',
         'browser/chromeos/external_protocol_dialog.h',
         'browser/chromeos/frame/browser_frame_view_chromeos.cc',
         'browser/chromeos/frame/browser_frame_view_chromeos.h',
         'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc',
         'browser/chromeos/frame/browser_view.cc',
@@ skipping 517 matching lines @@
         'browser/extensions/extension_disabled_infobar_delegate.cc',
         'browser/extensions/extension_disabled_infobar_delegate.h',
         'browser/extensions/extension_error_reporter.cc',
         'browser/extensions/extension_error_reporter.h',
         'browser/extensions/extension_event_names.cc',
         'browser/extensions/extension_event_names.h',
         'browser/extensions/extension_event_router.cc',
         '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',
         'browser/extensions/extension_function_dispatcher.h',
         'browser/extensions/extension_global_error.cc',
         'browser/extensions/extension_global_error.h',
         'browser/extensions/extension_global_error_badge.cc',
         'browser/extensions/extension_global_error_badge.h',
         'browser/extensions/extension_host.cc',
         'browser/extensions/extension_host.h',
         'browser/extensions/extension_host_mac.h',
         'browser/extensions/extension_host_mac.mm',
         'browser/extensions/extension_i18n_api.cc',
         'browser/extensions/extension_i18n_api.h',
         'browser/extensions/extension_icon_manager.cc',
         'browser/extensions/extension_icon_manager.h',
         'browser/extensions/extension_idle_api.cc',
         'browser/extensions/extension_idle_api.h',
         'browser/extensions/extension_idle_api_constants.cc',
         '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',
         'browser/extensions/extension_input_ui_api.h',
         'browser/extensions/extension_install_dialog.cc',
         'browser/extensions/extension_install_dialog.h',
         'browser/extensions/extension_install_ui.cc',
         'browser/extensions/extension_install_ui.h',
         'browser/extensions/extension_management_api.cc',
         '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',
         'browser/extensions/extension_message_handler.h',
         'browser/extensions/extension_message_service.cc',
         'browser/extensions/extension_message_service.h',
         'browser/extensions/extension_metrics_module.cc',
         'browser/extensions/extension_metrics_module.h',
         'browser/extensions/extension_module.cc',
         'browser/extensions/extension_module.h',
@@ skipping 106 matching lines @@
         'browser/extensions/external_extension_loader.h',
         'browser/extensions/external_extension_provider_impl.cc',
         'browser/extensions/external_extension_provider_impl.h',
         'browser/extensions/external_extension_provider_interface.h',
         'browser/extensions/external_policy_extension_loader.cc',
         'browser/extensions/external_policy_extension_loader.h',
         'browser/extensions/external_pref_extension_loader.cc',
         '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',
         'browser/extensions/image_loading_tracker.h',
         'browser/extensions/installed_loader.cc',
         'browser/extensions/installed_loader.h',
         'browser/extensions/key_identifier_conversion_views.cc',
         'browser/extensions/key_identifier_conversion_views.h',
         'browser/extensions/network_delay_listener.cc',
         'browser/extensions/network_delay_listener.h',
@@ skipping 2851 matching lines @@
           ],
           'sources/': [
             ['exclude', '^browser/safe_browsing/'],
           ],
         }],
         ['chromeos==0', {
           'sources/': [
             ['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'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
             ['exclude', 'browser/policy/device_policy_cache.cc'],
             ['exclude', 'browser/policy/device_policy_cache.h'],
             ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
             ['exclude', 'browser/policy/enterprise_install_attributes.h'],
             ['exclude', 'browser/policy/network_configuration_updater.cc'],
@@ skipping 35 matching lines @@
             'browser/printing/print_dialog_gtk.cc',
             'browser/printing/print_dialog_gtk.h',
             'browser/ui/gtk/repost_form_warning_gtk.cc',
             'browser/ui/gtk/repost_form_warning_gtk.h',
             'browser/upgrade_detector_impl.cc',
             'browser/upgrade_detector_impl.h',
           ],
         }],
         ['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', {
           'dependencies': [
             '../build/linux/system.gyp:ibus',
           ],
         }],
         ['use_cups==1', {
           'dependencies': [
             '../printing/printing.gyp:cups',
@@ skipping 835 matching lines @@
             ['toolkit_uses_gtk==1', {
               'sources/': [
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
               ],
             }],
             # These GTK files haven't been ported to views, while ChromeOS has
             # its own separate implementation below.  So re-include them only on
             # 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'],
                 ['include', '^browser/ui/gtk/select_file_dialog_impl_kde.cc'],
                 ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'],
                 ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'],
                 ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
                 ['include', '^browser/ui/views/notifications/balloon_view.cc'],
                 ['include', '^browser/ui/views/notifications/balloon_view.h'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
@@ skipping 17 matching lines @@
                 ['include', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
                 ['include', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
                 ['include', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
                 ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc'],
               ],
             }],
             # Exclude file manager files again
             # (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
             ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
                 ['exclude', '^browser/ui/browser_list_stub.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
@@ skipping 264 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }