From 645aea0956ca8dc3c823008be479c0ef3a4eacc7 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Mon, 13 May 2013 15:17:23 +0000 Subject: Support more keys for the Commands API: Arrow keys, Home, End, Ins, Del, PgUp, PgDwn, Tab, Comma and Period. Since the names of these keys are localizable (unlike A-Z, 0-9 -- that were the only keys we supported before), we need to stop relying on Accelerator::GetShortcutText (which localizes the string it returns). BUG=232884 TBR=willchan, sky Review URL: https://chromiumcodereview.appspot.com/14533005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199730 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/extensions/command_unittest.cc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'chrome/common/extensions/command_unittest.cc') diff --git a/chrome/common/extensions/command_unittest.cc b/chrome/common/extensions/command_unittest.cc index b47cfad..6a11bad 100644 --- a/chrome/common/extensions/command_unittest.cc +++ b/chrome/common/extensions/command_unittest.cc @@ -31,6 +31,18 @@ TEST(CommandTest, ExtensionCommandParsing) { const ui::Accelerator alt_shift_f = ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN); const ui::Accelerator ctrl_1 = ui::Accelerator(ui::VKEY_1, ctrl); + const ui::Accelerator ctrl_comma = ui::Accelerator(ui::VKEY_OEM_COMMA, ctrl); + const ui::Accelerator ctrl_dot = ui::Accelerator(ui::VKEY_OEM_PERIOD, ctrl); + const ui::Accelerator ctrl_left = ui::Accelerator(ui::VKEY_LEFT, ctrl); + const ui::Accelerator ctrl_right = ui::Accelerator(ui::VKEY_RIGHT, ctrl); + const ui::Accelerator ctrl_up = ui::Accelerator(ui::VKEY_UP, ctrl); + const ui::Accelerator ctrl_down = ui::Accelerator(ui::VKEY_DOWN, ctrl); + const ui::Accelerator ctrl_ins = ui::Accelerator(ui::VKEY_INSERT, ctrl); + const ui::Accelerator ctrl_del = ui::Accelerator(ui::VKEY_DELETE, ctrl); + const ui::Accelerator ctrl_home = ui::Accelerator(ui::VKEY_HOME, ctrl); + const ui::Accelerator ctrl_end = ui::Accelerator(ui::VKEY_END, ctrl); + const ui::Accelerator ctrl_pgup = ui::Accelerator(ui::VKEY_PRIOR, ctrl); + const ui::Accelerator ctrl_pgdwn = ui::Accelerator(ui::VKEY_NEXT, ctrl); const struct { bool expected_result; @@ -75,6 +87,19 @@ TEST(CommandTest, ExtensionCommandParsing) { // Skipping description is OK for browser- and pageActions. { true, ctrl_f, "_execute_browser_action", "Ctrl+F", "" }, { true, ctrl_f, "_execute_page_action", "Ctrl+F", "" }, + // Home, End, Arrow keys, etc. + { true, ctrl_comma, "_execute_browser_action", "Ctrl+Comma", "" }, + { true, ctrl_dot, "_execute_browser_action", "Ctrl+Period", "" }, + { true, ctrl_left, "_execute_browser_action", "Ctrl+Left", "" }, + { true, ctrl_right, "_execute_browser_action", "Ctrl+Right", "" }, + { true, ctrl_up, "_execute_browser_action", "Ctrl+Up", "" }, + { true, ctrl_down, "_execute_browser_action", "Ctrl+Down", "" }, + { true, ctrl_ins, "_execute_browser_action", "Ctrl+Insert", "" }, + { true, ctrl_del, "_execute_browser_action", "Ctrl+Delete", "" }, + { true, ctrl_home, "_execute_browser_action", "Ctrl+Home", "" }, + { true, ctrl_end, "_execute_browser_action", "Ctrl+End", "" }, + { true, ctrl_pgup, "_execute_browser_action", "Ctrl+PageUp", "" }, + { true, ctrl_pgdwn, "_execute_browser_action", "Ctrl+PageDown", "" }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) { -- cgit v1.1