Revert of Use a stub implementation of GlobalShortcutListener for Athena...

Revert of Use a stub implementation of GlobalShortcutListener for Athena (patchset #3 id:100001 of https://codereview.chromium.org/697803002/)

Reason for revert:
This CL breaks GN build on ChromeOS:
http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20GN&number=187

The error message was:
ERROR at //chrome/browser/extensions/BUILD.gn:189:7: Item not found
      "global_shortcut_listener_x11.cc",
      ^--------------------------------
You were trying to remove "global_shortcut_listener_x11.cc"
from the list but it wasn't there.

Original issue's description:
> Use a stub implementation of GlobalShortcutListener for Athena
>
> BUG=426561
> TEST=None
>
> Committed: https://crrev.com/3064611cafd0464e4899dfdf7f485efe71f3ef57
> Cr-Commit-Position: refs/heads/master@{#302578}

TBR=oshima@chromium.org,asargent@chromium.org,pkotwicz@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=426561

Review URL: https://codereview.chromium.org/697343002

Cr-Commit-Position: refs/heads/master@{#302580}

chrome/browser/extensions/BUILD.gn

@@ -119,11 +119,6 @@ static_library("extensions") {
     sources += rebase_path(
       gypi_values.chrome_browser_extensions_non_athena_sources,
         ".", "//chrome")
-    if (is_chromeos) {
-      sources += rebase_path(
-        gypi_values.chrome_browser_extensions_chromeos_non_athena_sources,
-        ".", "//chrome")
-    }
   }
 
   if (is_linux) {

chrome/browser/extensions/global_shortcut_listener_athena.cc

-// Copyright 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.
-
-#include "base/logging.h"
-#include "chrome/browser/extensions/global_shortcut_listener_athena.h"
-
-namespace extensions {
-
-// static
-GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
-  static GlobalShortcutListenerAthena* instance =
-      new GlobalShortcutListenerAthena();
-  return instance;
-}
-
-GlobalShortcutListenerAthena::GlobalShortcutListenerAthena() {
-  // TODO: Compile out the CommandService on Athena. crbug.com/429398
-}
-
-GlobalShortcutListenerAthena::~GlobalShortcutListenerAthena() {
-}
-
-void GlobalShortcutListenerAthena::StartListening() {
-  NOTIMPLEMENTED();
-}
-
-void GlobalShortcutListenerAthena::StopListening() {
-  NOTIMPLEMENTED();
-}
-
-bool GlobalShortcutListenerAthena::RegisterAcceleratorImpl(
-    const ui::Accelerator& accelerator) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void GlobalShortcutListenerAthena::UnregisterAcceleratorImpl(
-    const ui::Accelerator& accelerator) {
-  NOTIMPLEMENTED();
-}
-
-}  // namespace extensions

chrome/browser/extensions/global_shortcut_listener_athena.h

-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_ATHENA_H_
-#define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_ATHENA_H_
-
-#include "chrome/browser/extensions/global_shortcut_listener.h"
-
-namespace extensions {
-
-// Athena implementation of GlobalShortcutListener.
-class GlobalShortcutListenerAthena : public GlobalShortcutListener {
- public:
-  GlobalShortcutListenerAthena();
-  ~GlobalShortcutListenerAthena() override;
-
- private:
-  // GlobalShortcutListener:
-  void StartListening() override;
-  void StopListening() override;
-  bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-  void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
-
-  DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerAthena);
-};
-
-}  // namespace extensions
-
-#endif  // CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_ATHENA_H_

chrome/chrome_browser_extensions.gypi

@@ -47,14 +47,6 @@
       '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',
@@ -702,6 +694,16 @@
       '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',
@@ -874,17 +876,11 @@
       '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',
     ],
   },
   # ----------------------------------------------------------------------------
@@ -1009,11 +1005,6 @@
           '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': [