Use a stub implementation of GlobalShortcutListener for Athena

BUG=426561
TEST=None

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

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

chrome/browser/extensions/BUILD.gn

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