Support global keyboard commands on Chrome OS.

chrome/browser/extensions/extension_commands_global_registry_apitest.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 93 matching lines @@
   CGEventPost(event_tap_location, shift_down);
   CGEventPost(event_tap_location, key_down);
   CGEventPost(event_tap_location, key_up);
   CGEventPost(event_tap_location, shift_up);
   CGEventPost(event_tap_location, command_up);
 
   CFRelease(event_source);
 }
 #endif
 
-#if defined(OS_CHROMEOS)
-// Fully implemented everywhere except Chrome OS.
-#define MAYBE_GlobalCommand DISABLED_GlobalCommand
-#else
-#define MAYBE_GlobalCommand GlobalCommand
-#endif
-
 // Test the basics of global commands and make sure they work when Chrome
 // doesn't have focus. Also test that non-global commands are not treated as
 // global and that keys beyond Ctrl+Shift+[0..9] cannot be auto-assigned by an
 // extension.
-IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, MAYBE_GlobalCommand) {
-  FeatureSwitch::ScopedOverride enable_global_commands(
-      FeatureSwitch::global_commands(), true);
-
+IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, GlobalCommand) {
   // Load the extension in the non-incognito browser.
   ResultCatcher catcher;
   ASSERT_TRUE(RunExtensionTest("keybinding/global")) << message_;
   ASSERT_TRUE(catcher.GetNextResult());
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
   // Our infrastructure for sending keys expects a browser to send them to, but
   // to properly test global shortcuts you need to send them to another target.
   // So, create an incognito browser to use as a target to send the shortcuts
   // to. It will ignore all of them and allow us test whether the global
   // shortcut really is global in nature and also that the non-global shortcut
   // is non-global.
   Browser* incognito_browser = CreateIncognitoBrowser();
 
   // Try to activate the non-global shortcut (Ctrl+Shift+1) and the
   // non-assignable shortcut (Ctrl+Shift+A) by sending the keystrokes to the
   // incognito browser. Both shortcuts should have no effect (extension is not
   // loaded there).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       incognito_browser, ui::VKEY_1, true, true, false, false));
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       incognito_browser, ui::VKEY_A, true, true, false, false));
 
-  // Activate the shortcut (Ctrl+Shift+9). This should have an effect.
+  // Activate the shortcut (Ctrl+Shift+8). This should have an effect.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      incognito_browser, ui::VKEY_9, true, true, false, false));
+      incognito_browser, ui::VKEY_8, true, true, false, false));
 #elif defined(OS_LINUX) && defined(USE_X11)
   // Create an incognito browser to capture the focus.
   CreateIncognitoBrowser();
 
   // On Linux, our infrastructure for sending keys just synthesize keyboard
   // event and send them directly to the specified window, without notifying the
   // X root window. It didn't work while testing global shortcut because the
   // stuff of global shortcut on Linux need to be notified when KeyPress event
   // is happening on X root window. So we simulate the keyboard input here.
   SendNativeKeyEventToXDisplay(ui::VKEY_1, true, true, false);
   SendNativeKeyEventToXDisplay(ui::VKEY_A, true, true, false);
-  SendNativeKeyEventToXDisplay(ui::VKEY_9, true, true, false);
+  SendNativeKeyEventToXDisplay(ui::VKEY_8, true, true, false);
 #elif defined(OS_MACOSX)
   // Create an incognito browser to capture the focus.
   CreateIncognitoBrowser();
 
   // Send some native mac key events.
   SendNativeCommandShift(kVK_ANSI_1);
   SendNativeCommandShift(kVK_ANSI_A);
-  SendNativeCommandShift(kVK_ANSI_9);
+  SendNativeCommandShift(kVK_ANSI_8);
 #endif
 
   // If this fails, it might be because the global shortcut failed to work,
   // but it might also be because the non-global shortcuts unexpectedly
   // worked.
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 #if defined(OS_WIN)
-// The feature is only fully implemented on Windows, other platforms coming.
+// Feature only fully implemented on Windows, other platforms coming.
 // TODO(smus): On mac, SendKeyPress must first support media keys.
 #define MAYBE_GlobalDuplicatedMediaKey GlobalDuplicatedMediaKey
 #else
 #define MAYBE_GlobalDuplicatedMediaKey DISABLED_GlobalDuplicatedMediaKey
 #endif
 
 IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, MAYBE_GlobalDuplicatedMediaKey) {
-  FeatureSwitch::ScopedOverride enable_global_commands(
-      FeatureSwitch::global_commands(), true);
-
   ResultCatcher catcher;
   ASSERT_TRUE(RunExtensionTest("keybinding/global_media_keys_0")) << message_;
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(RunExtensionTest("keybinding/global_media_keys_1")) << message_;
   ASSERT_TRUE(catcher.GetNextResult());
 
   Browser* incognito_browser = CreateIncognitoBrowser();  // Ditto.
   WindowController* controller =
       incognito_browser->extension_window_controller();
 
   ui_controls::SendKeyPress(controller->window()->GetNativeWindow(),
                             ui::VKEY_MEDIA_NEXT_TRACK,
                             false,
                             false,
                             false,
                             false);
 
-  // We should get two success result.
+  // We should get two success results.
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace extensions