chromeos: Make keyboard shortcuts consistent with Windows.

This change updates the Chrome OS keyboard accelerator table
to match the order and contents of the Windows table, modulo
function-key differences and a few additional accelerators
that only make sense for Chrome OS.

BUG=chromium-os:1474
TEST=tried them

Review URL: http://codereview.chromium.org/3017028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53556 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 101 insertions, 133 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index c6f72d8..4c95af0 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -32,6 +32,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // pick those up in the WM_APPCOMMAND message.
 IDR_MAINFRAME ACCELERATORS
 BEGIN
+    "A",            IDC_AUTOFILL_DEFAULT,       VIRTKEY, CONTROL, SHIFT
     VK_LEFT,        IDC_BACK,                   VIRTKEY, ALT
     VK_BACK,        IDC_BACK,                   VIRTKEY
     "D",            IDC_BOOKMARK_PAGE,          VIRTKEY, CONTROL
@@ -116,7 +117,6 @@ BEGIN
     VK_OEM_PLUS,    IDC_ZOOM_PLUS,              VIRTKEY, CONTROL
     VK_OEM_PLUS,    IDC_ZOOM_PLUS,              VIRTKEY, CONTROL, SHIFT
     VK_ADD,         IDC_ZOOM_PLUS,              VIRTKEY, CONTROL
-    "A",            IDC_AUTOFILL_DEFAULT,       VIRTKEY, CONTROL, SHIFT
 END
 
 IDR_CHROMEFRAME ACCELERATORS
diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc
index 584efe7..a6450c6 100644
--- a/chrome/browser/views/accelerator_table_gtk.cc
+++ b/chrome/browser/views/accelerator_table_gtk.cc
@@ -10,163 +10,131 @@
 
 namespace browser {
 
+// NOTE: Keep this list in the same (mostly-alphabetical) order as
+// the Windows accelerators in ../../app/chrome_dll.rc.
 const AcceleratorMapping kAcceleratorMap[] = {
-  // Format { keycode, shift_pressed, ctrl_pressed, alt_pressed, command_id }
-
-  // Focus.
-  { base::VKEY_K, false, true, false, IDC_FOCUS_SEARCH },
-  { base::VKEY_E, false, true, false, IDC_FOCUS_SEARCH },
-  { base::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
-  { base::VKEY_L, false, true, false, IDC_FOCUS_LOCATION },
-  { base::VKEY_D, false, false, true, IDC_FOCUS_LOCATION },
-  { base::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR },
-  { base::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS },
-  { base::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS },
-#if !defined(OS_CHROMEOS)
-  { base::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE },
-  { base::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE },
-  { base::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR },
+  // Keycode                   Shift  Ctrl   Alt    Command ID
+  { base::VKEY_A,              true,  true,  false, IDC_AUTOFILL_DEFAULT },
+  { base::VKEY_LEFT,           false, false, true,  IDC_BACK },
+  { base::VKEY_BACK,           false, false, false, IDC_BACK },
+#if defined(OS_CHROMEOS)
+  { base::VKEY_F1,             false, false, false, IDC_BACK },
 #endif
-  { base::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR },
-
-  // Tab/window controls.
-  { base::VKEY_T, false, true, false, IDC_NEW_TAB },
-  { base::VKEY_N, false, true, false, IDC_NEW_WINDOW },
-  { base::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
-  { base::VKEY_DOWN, false, true, false, IDC_SELECT_NEXT_TAB },
-  { base::VKEY_UP, false, true, false, IDC_SELECT_PREVIOUS_TAB },
-  { base::VKEY_W, false, true, false, IDC_CLOSE_TAB },
-  { base::VKEY_T, true, true, false, IDC_RESTORE_TAB },
-  { base::VKEY_W, true, true, false, IDC_CLOSE_WINDOW },
-
-  { base::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
-  { base::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
-
-  { base::VKEY_1, false, true, false, IDC_SELECT_TAB_0 },
-  { base::VKEY_2, false, true, false, IDC_SELECT_TAB_1 },
-  { base::VKEY_3, false, true, false, IDC_SELECT_TAB_2 },
-  { base::VKEY_4, false, true, false, IDC_SELECT_TAB_3 },
-  { base::VKEY_5, false, true, false, IDC_SELECT_TAB_4 },
-  { base::VKEY_6, false, true, false, IDC_SELECT_TAB_5 },
-  { base::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
-  { base::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
-  { base::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
-
-  { base::VKEY_1, false, false, true, IDC_SELECT_TAB_0 },
-  { base::VKEY_2, false, false, true, IDC_SELECT_TAB_1 },
-  { base::VKEY_3, false, false, true, IDC_SELECT_TAB_2 },
-  { base::VKEY_4, false, false, true, IDC_SELECT_TAB_3 },
-  { base::VKEY_5, false, false, true, IDC_SELECT_TAB_4 },
-  { base::VKEY_6, false, false, true, IDC_SELECT_TAB_5 },
-  { base::VKEY_7, false, false, true, IDC_SELECT_TAB_6 },
-  { base::VKEY_8, false, false, true, IDC_SELECT_TAB_7 },
-  { base::VKEY_9, false, false, true, IDC_SELECT_LAST_TAB },
-
-  { base::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 },
-  { base::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 },
-  { base::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 },
-  { base::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 },
-  { base::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 },
-  { base::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 },
-  { base::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
-  { base::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
-  { base::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
-
-  { base::VKEY_NUMPAD1, false, false, true, IDC_SELECT_TAB_0 },
-  { base::VKEY_NUMPAD2, false, false, true, IDC_SELECT_TAB_1 },
-  { base::VKEY_NUMPAD3, false, false, true, IDC_SELECT_TAB_2 },
-  { base::VKEY_NUMPAD4, false, false, true, IDC_SELECT_TAB_3 },
-  { base::VKEY_NUMPAD5, false, false, true, IDC_SELECT_TAB_4 },
-  { base::VKEY_NUMPAD6, false, false, true, IDC_SELECT_TAB_5 },
-  { base::VKEY_NUMPAD7, false, false, true, IDC_SELECT_TAB_6 },
-  { base::VKEY_NUMPAD8, false, false, true, IDC_SELECT_TAB_7 },
-  { base::VKEY_NUMPAD9, false, false, true, IDC_SELECT_LAST_TAB },
-
+  { base::VKEY_D,              false, true,  false, IDC_BOOKMARK_PAGE },
+  { base::VKEY_D,              true,  true,  false, IDC_BOOKMARK_ALL_TABS },
+  { base::VKEY_DELETE,         true,  true,  false, IDC_CLEAR_BROWSING_DATA },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
-  { base::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
+  { base::VKEY_F4,             false, true,  false, IDC_CLOSE_TAB },
 #endif
-
-  // Zoom level.
-  { base::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
-  { base::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
-  { base::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
-  { base::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
-  { base::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
-
-  // Find in page.
-  { base::VKEY_F, false, true, false, IDC_FIND },
-  { base::VKEY_G, false, true, false, IDC_FIND_NEXT },
+  { base::VKEY_W,              false, true,  false, IDC_CLOSE_TAB },
+  { base::VKEY_W,              true,  true,  false, IDC_CLOSE_WINDOW },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F3, false, false, false, IDC_FIND_NEXT },
+  { base::VKEY_F4,             false, false, true,  IDC_CLOSE_WINDOW },
 #endif
-  { base::VKEY_G, true, true, false, IDC_FIND_PREVIOUS },
+  { base::VKEY_Q,              true,  true,  false, IDC_EXIT },
+  { base::VKEY_F,              false, true,  false, IDC_FIND },
+  { base::VKEY_G,              false, true,  false, IDC_FIND_NEXT },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS },
+  { base::VKEY_F3,             false, false, false, IDC_FIND_NEXT },
 #endif
-
-  // Navigation / toolbar buttons.
-  { base::VKEY_HOME, false, false, true, IDC_HOME },
-  { base::VKEY_ESCAPE, false, false, false, IDC_STOP },
-  { base::VKEY_LEFT, false, false, true, IDC_BACK },
-  { base::VKEY_BACK, false, false, false, IDC_BACK },
-#if defined(OS_CHROMEOS)
-  { base::VKEY_F1, false, false, false, IDC_BACK },
+  { base::VKEY_G,              true,  true,  false, IDC_FIND_PREVIOUS },
+#if !defined(OS_CHROMEOS)
+  { base::VKEY_F3,             true,  false, false, IDC_FIND_PREVIOUS },
 #endif
-  { base::VKEY_RIGHT, false, false, true, IDC_FORWARD },
-  { base::VKEY_BACK, true, false, false, IDC_FORWARD },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F2, false, false, false, IDC_FORWARD },
+  { base::VKEY_S,              true,  false, true,  IDC_FOCUS_CHROMEOS_STATUS },
 #endif
-  { base::VKEY_R, false, true, false, IDC_RELOAD },
-  { base::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F5, false, false, false, IDC_RELOAD },
-  { base::VKEY_F5, false,  true, false, IDC_RELOAD_IGNORING_CACHE },
-  { base::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
+  { base::VKEY_F6,             false, false, false, IDC_FOCUS_NEXT_PANE },
+  { base::VKEY_F6,             true,  false, false, IDC_FOCUS_PREVIOUS_PANE },
 #endif
-
-  // AutoFill.
-  { base::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT },
-
-  // Miscellany.
-  { base::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
-  { base::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
-  { base::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
-  { base::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
-  { base::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
-  { base::VKEY_O, false, true, false, IDC_OPEN_FILE },
+  { base::VKEY_D,              false, false, true,  IDC_FOCUS_LOCATION },
+  { base::VKEY_L,              false, true,  false, IDC_FOCUS_LOCATION },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F11, false, false, false, IDC_FULLSCREEN },
+  { base::VKEY_F10,            false, false, false, IDC_FOCUS_MENU_BAR },
 #endif
+  { base::VKEY_MENU,           false, false, false, IDC_FOCUS_MENU_BAR },
+  { base::VKEY_K,              false, true,  false, IDC_FOCUS_SEARCH },
+  { base::VKEY_E,              false, true,  false, IDC_FOCUS_SEARCH },
+  { base::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
+  { base::VKEY_T,              true,  false, true,  IDC_FOCUS_TOOLBAR },
+  { base::VKEY_B,              true,  false, true,  IDC_FOCUS_BOOKMARKS },
+  { base::VKEY_RIGHT,          false, false, true,  IDC_FORWARD },
+  { base::VKEY_BACK,           true,  false, false, IDC_FORWARD },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F4, false, false, false, IDC_FULLSCREEN },
+  { base::VKEY_F2,             false, false, false, IDC_FORWARD },
 #endif
-  { base::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
-  { base::VKEY_I, true, true, false, IDC_DEV_TOOLS },
-  { base::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
-  { base::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
-  { base::VKEY_P, false, true, false, IDC_PRINT},
-  { base::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F11, false, true, true, IDC_FULLSCREEN },
+  { base::VKEY_F11,            false, false, false, IDC_FULLSCREEN },
 #endif
-  { base::VKEY_DELETE, false, true, true, IDC_TASK_MANAGER },
-  { base::VKEY_OEM_COMMA, false, true, false, IDC_SYSTEM_OPTIONS },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F5, false, false, false, IDC_SYSTEM_OPTIONS },
+  { base::VKEY_F4,             false, false, false, IDC_FULLSCREEN },
+#endif
+#if !defined(OS_CHROMEOS)
+  { base::VKEY_F1,             false, false, false, IDC_HELP_PAGE },
 #endif
-  { base::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
+  { base::VKEY_I,              true,  true,  false, IDC_DEV_TOOLS },
+  { base::VKEY_J,              true,  true,  false, IDC_DEV_TOOLS_CONSOLE },
+  { base::VKEY_C,              true,  true,  false, IDC_DEV_TOOLS_INSPECT },
+  { base::VKEY_N,              true,  true,  false, IDC_NEW_INCOGNITO_WINDOW },
+  { base::VKEY_T,              false, true,  false, IDC_NEW_TAB },
+  { base::VKEY_N,              false, true,  false, IDC_NEW_WINDOW },
+  { base::VKEY_O,              false, true,  false, IDC_OPEN_FILE },
+  { base::VKEY_P,              false, true,  false, IDC_PRINT},
+  { base::VKEY_R,              false, true,  false, IDC_RELOAD },
+  { base::VKEY_R,              true,  true,  false, IDC_RELOAD_IGNORING_CACHE },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F1, false, false, false, IDC_HELP_PAGE },
+  { base::VKEY_F5,             false, false, false, IDC_RELOAD },
+  { base::VKEY_F5,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
+  { base::VKEY_F5,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
+#endif
+  { base::VKEY_HOME,           false, false, true,  IDC_HOME },
+  { base::VKEY_T,              true,  true,  false, IDC_RESTORE_TAB },
+  { base::VKEY_S,              false, true,  false, IDC_SAVE_PAGE },
+#if defined(OS_CHROMEOS)
+  { base::VKEY_LWIN,           false, false, false, IDC_SEARCH },
 #endif
-  { base::VKEY_Q, true, true, false, IDC_EXIT },
-  { base::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
-  { base::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
+  { base::VKEY_9,              false, true,  false, IDC_SELECT_LAST_TAB },
+  { base::VKEY_NUMPAD9,        false, true,  false, IDC_SELECT_LAST_TAB },
+  { base::VKEY_TAB,            false, true,  false, IDC_SELECT_NEXT_TAB },
+  { base::VKEY_NEXT,           false, true,  false, IDC_SELECT_NEXT_TAB },
+  { base::VKEY_TAB,            true,  true,  false, IDC_SELECT_PREVIOUS_TAB },
+  { base::VKEY_PRIOR,          false, true,  false, IDC_SELECT_PREVIOUS_TAB },
+  { base::VKEY_1,              false, true,  false, IDC_SELECT_TAB_0 },
+  { base::VKEY_NUMPAD1,        false, true,  false, IDC_SELECT_TAB_0 },
+  { base::VKEY_2,              false, true,  false, IDC_SELECT_TAB_1 },
+  { base::VKEY_NUMPAD2,        false, true,  false, IDC_SELECT_TAB_1 },
+  { base::VKEY_3,              false, true,  false, IDC_SELECT_TAB_2 },
+  { base::VKEY_NUMPAD3,        false, true,  false, IDC_SELECT_TAB_2 },
+  { base::VKEY_4,              false, true,  false, IDC_SELECT_TAB_3 },
+  { base::VKEY_NUMPAD4,        false, true,  false, IDC_SELECT_TAB_3 },
+  { base::VKEY_5,              false, true,  false, IDC_SELECT_TAB_4 },
+  { base::VKEY_NUMPAD5,        false, true,  false, IDC_SELECT_TAB_4 },
+  { base::VKEY_6,              false, true,  false, IDC_SELECT_TAB_5 },
+  { base::VKEY_NUMPAD6,        false, true,  false, IDC_SELECT_TAB_5 },
+  { base::VKEY_7,              false, true,  false, IDC_SELECT_TAB_6 },
+  { base::VKEY_NUMPAD7,        false, true,  false, IDC_SELECT_TAB_6 },
+  { base::VKEY_8,              false, true,  false, IDC_SELECT_TAB_7 },
+  { base::VKEY_NUMPAD8,        false, true,  false, IDC_SELECT_TAB_7 },
+  { base::VKEY_B,              true,  true,  false, IDC_SHOW_BOOKMARK_BAR },
+  { base::VKEY_J,              false, true,  false, IDC_SHOW_DOWNLOADS },
+  { base::VKEY_H,              false, true,  false, IDC_SHOW_HISTORY },
+  { base::VKEY_F,              false, false, true,  IDC_SHOW_APP_MENU},
+  { base::VKEY_E,              false, false, true,  IDC_SHOW_APP_MENU},
+  { base::VKEY_ESCAPE,         false, false, false, IDC_STOP },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F, false, true, true, IDC_FULLSCREEN },
-  { base::VKEY_LWIN, false, false, false, IDC_SEARCH },
+  { base::VKEY_F5,             false, false, false, IDC_SYSTEM_OPTIONS },
 #endif
+  { base::VKEY_ESCAPE,         true,  false, false, IDC_TASK_MANAGER },
+  { base::VKEY_U,              false, true,  false, IDC_VIEW_SOURCE },
+  { base::VKEY_OEM_MINUS,      false, true,  false, IDC_ZOOM_MINUS },
+  { base::VKEY_OEM_MINUS,      true,  true,  false, IDC_ZOOM_MINUS },
+  { base::VKEY_SUBTRACT,       false, true,  false, IDC_ZOOM_MINUS },
+  { base::VKEY_0,              false, true,  false, IDC_ZOOM_NORMAL },
+  { base::VKEY_NUMPAD0,        false, true,  false, IDC_ZOOM_NORMAL },
+  { base::VKEY_OEM_PLUS,       false, true,  false, IDC_ZOOM_PLUS },
+  { base::VKEY_OEM_PLUS,       true,  true,  false, IDC_ZOOM_PLUS },
+  { base::VKEY_ADD,            false, true,  false, IDC_ZOOM_PLUS },
 };
 
 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);