Revert of Use a stub implementation of GlobalShortcutListener for Athena

chrome/chrome_browser_extensions.gypi

 # Copyright (c) 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.
 
 {
   'variables': {
     'chrome_browser_extensions_chromeos_sources': [
       'browser/extensions/api/diagnostics/diagnostics_api.cc',
       'browser/extensions/api/diagnostics/diagnostics_api.h',
       'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc',
@@ skipping 29 matching lines @@
       'browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc',
       'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
       'browser/extensions/api/image_writer_private/operation_nonchromeos.cc',
       'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc',
       'browser/extensions/api/messaging/native_message_process_host.cc',
       'browser/extensions/api/messaging/native_message_process_host.h',
       'browser/extensions/api/messaging/native_process_launcher.cc',
       'browser/extensions/api/messaging/native_process_launcher.h',
       'browser/extensions/api/messaging/native_process_launcher_posix.cc',
       'browser/extensions/api/messaging/native_process_launcher_win.cc',
-      'browser/extensions/global_shortcut_listener_mac.h',
-      'browser/extensions/global_shortcut_listener_mac.mm',
-      'browser/extensions/global_shortcut_listener_ozone.cc',
-      'browser/extensions/global_shortcut_listener_ozone.h',
-      'browser/extensions/global_shortcut_listener_win.cc',
-      'browser/extensions/global_shortcut_listener_win.h',
-      'browser/extensions/global_shortcut_listener_x11.cc',
-      'browser/extensions/global_shortcut_listener_x11.h',
     ],
     'chrome_browser_extensions_enabled_sources': [
       'browser/apps/app_launch_for_metro_restart_win.cc',
       'browser/apps/app_launch_for_metro_restart_win.h',
       'browser/apps/app_url_redirector.cc',
       'browser/apps/app_url_redirector.h',
       'browser/apps/app_window_registry_util.cc',
       'browser/apps/app_window_registry_util.h',
       'browser/apps/ephemeral_app_launcher.cc',
       'browser/apps/ephemeral_app_launcher.h',
@@ skipping 623 matching lines @@
       'browser/extensions/external_pref_loader.cc',
       'browser/extensions/external_pref_loader.h',
       'browser/extensions/external_provider_impl.cc',
       'browser/extensions/external_provider_impl.h',
       'browser/extensions/external_registry_loader_win.cc',
       'browser/extensions/external_registry_loader_win.h',
       'browser/extensions/favicon_downloader.cc',
       'browser/extensions/favicon_downloader.h',
       'browser/extensions/global_shortcut_listener.cc',
       'browser/extensions/global_shortcut_listener.h',
+      'browser/extensions/global_shortcut_listener_chromeos.cc',
+      'browser/extensions/global_shortcut_listener_chromeos.h',
+      'browser/extensions/global_shortcut_listener_mac.h',
+      'browser/extensions/global_shortcut_listener_mac.mm',
+      'browser/extensions/global_shortcut_listener_ozone.cc',
+      'browser/extensions/global_shortcut_listener_ozone.h',
+      'browser/extensions/global_shortcut_listener_win.cc',
+      'browser/extensions/global_shortcut_listener_win.h',
+      'browser/extensions/global_shortcut_listener_x11.cc',
+      'browser/extensions/global_shortcut_listener_x11.h',
       'browser/extensions/install_observer.cc',
       'browser/extensions/install_observer.h',
       'browser/extensions/install_signer.cc',
       'browser/extensions/install_signer.h',
       'browser/extensions/install_tracker.cc',
       'browser/extensions/install_tracker.h',
       'browser/extensions/install_tracker_factory.cc',
       'browser/extensions/install_tracker_factory.h',
       'browser/extensions/install_verifier.cc',
       'browser/extensions/install_verifier.h',
@@ skipping 152 matching lines @@
       'browser/extensions/api/storage/managed_value_store_cache.h',
       'browser/extensions/api/storage/policy_value_store.cc',
       'browser/extensions/api/storage/policy_value_store.h',
     ],
     'chrome_browser_extensions_non_athena_sources': [
       'browser/extensions/api/tabs/tabs_api.cc',
       'browser/extensions/display_info_provider_chromeos.cc',
       'browser/extensions/display_info_provider_chromeos.h',
       'browser/extensions/extension_tab_util.cc',
     ],
-    'chrome_browser_extensions_chromeos_non_athena_sources': [
-      'browser/extensions/global_shortcut_listener_chromeos.cc',
-      'browser/extensions/global_shortcut_listener_chromeos.h',
-    ],
     'chrome_browser_extensions_athena_sources': [
       'browser/extensions/api/tabs/tabs_api_athena.cc',
       'browser/extensions/display_info_provider_athena.cc',
       'browser/extensions/display_info_provider_athena.h',
       'browser/extensions/extension_tab_util_athena.cc',
-      'browser/extensions/global_shortcut_listener_athena.cc',
-      'browser/extensions/global_shortcut_listener_athena.h',
     ],
   },
   # ----------------------------------------------------------------------------
   # Note on GN build: everything below here is duplicated in
   # chrome/browser/BUILD.gn. If you change anything, you will also have to
   # update that file. Some short and probably rarely-changing file lists are
   # duplicated between the builds. If a list gets longer or is changed it is
   # probably worth sharing.
   'targets': [
     {
@@ skipping 104 matching lines @@
           'dependencies': [
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
           ],
         }],
         ['use_athena==1', {
           'defines': ['USE_ATHENA=1'],
           'sources': ['<@(chrome_browser_extensions_athena_sources)'],
         }, {
           'sources': ['<@(chrome_browser_extensions_non_athena_sources)'],
-          'conditions': [
-            ['chromeos==1', {
-              'sources': [ '<@(chrome_browser_extensions_chromeos_non_athena_sources)'],
-            }],
-          ],
         }],
         ['OS=="linux"', {
           'conditions': [
             ['use_aura==1', {
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
@@ skipping 105 matching lines @@
           ],
         }, {  # use_brlapi==0
           'sources': [
             'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
           ],
         }],
       ],
     },
   ],
 }