summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_keybinding_apitest.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-31 10:29:22 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-31 10:29:22 +0000
commit322482d8d07ae7e3730a736eed48b502ee2d4ea2 (patch)
treeca086635209ab913ab4ecbb0791654ba6b8026dc /chrome/browser/extensions/extension_keybinding_apitest.cc
parent3e21204ac178f479726b07a06a04388d08f0d382 (diff)
downloadchromium_src-322482d8d07ae7e3730a736eed48b502ee2d4ea2.zip
chromium_src-322482d8d07ae7e3730a736eed48b502ee2d4ea2.tar.gz
chromium_src-322482d8d07ae7e3730a736eed48b502ee2d4ea2.tar.bz2
Extension Commands: Make Ctrl mean Command on Mac. If you really want Ctrl as a shortcut for your extension command you can specify MacCtrl in your manifest. I also took out the special mac-only Options key, as the Mac keyboard shows it is also called Alt (and is treated in code like Alt), so we might as well keep it consistent across all platforms.
BUG=144463 TEST=Automated test included. Review URL: https://chromiumcodereview.appspot.com/10882033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_keybinding_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_keybinding_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index fd8794a..fed2174 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -118,9 +118,9 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) {
ASSERT_TRUE(action);
EXPECT_EQ("Make this page red", action->GetTitle(tab_id));
- // Activate the shortcut (Ctrl+Shift+F).
+ // Activate the shortcut (Alt+Shift+F).
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
- browser(), ui::VKEY_F, true, true, false, false));
+ browser(), ui::VKEY_F, false, true, true, false));
// Verify the command worked (the page action turns the page red).
WebContents* tab = chrome::GetActiveWebContents(browser());