diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h index f3ee8a..9ab41c 100644 --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h @@ -50,7 +50,8 @@ #define IDC_SELECT_TAB_5 34023 #define IDC_SELECT_TAB_6 34024 #define IDC_SELECT_TAB_7 34025 -#define IDC_SELECT_LAST_TAB 34026 +#define IDC_SELECT_TAB_8 34026 +#define IDC_SELECT_LAST_TAB 34057 #define IDC_DUPLICATE_TAB 34027 #define IDC_RESTORE_TAB 34028 #define IDC_SHOW_AS_TAB 34029 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 2abd32..ff7f9e 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -502,6 +502,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( case IDC_SELECT_TAB_5: case IDC_SELECT_TAB_6: case IDC_SELECT_TAB_7: + case IDC_SELECT_TAB_8: base::RecordAction(base::UserMetricsAction("Accel_SelectNumberedTab")); SelectNumberedTab( browser_, id - IDC_SELECT_TAB_0, @@ -1370,6 +1371,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, supports_tabs); command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, supports_tabs); command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, supports_tabs); + command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_8, supports_tabs); command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, supports_tabs); command_updater_.UpdateCommandEnabled(IDC_NEW_TAB_TO_RIGHT, supports_tabs); diff --git a/chrome/browser/ui/accelerator_table.cc b/chrome/browser/ui/accelerator_table.cc index 20f57e..230bc6 100644 --- a/chrome/browser/ui/accelerator_table.cc +++ b/chrome/browser/ui/accelerator_table.cc @@ -51,8 +51,8 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_ESCAPE, ui::EF_NONE, IDC_CLOSE_FIND_OR_STOP}, #if !BUILDFLAG(IS_MAC) - {ui::VKEY_D, ui::EF_PLATFORM_ACCELERATOR, IDC_BOOKMARK_THIS_TAB}, - {ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, + {ui::VKEY_M, ui::EF_PLATFORM_ACCELERATOR, IDC_BOOKMARK_THIS_TAB}, + {ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_BOOKMARK_ALL_TABS}, {ui::VKEY_W, ui::EF_PLATFORM_ACCELERATOR, IDC_CLOSE_TAB}, {ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, @@ -70,21 +70,16 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_RELOAD_BYPASSING_CACHE}, {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, - {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, - {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, -#if BUILDFLAG(IS_LINUX) - {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, - {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, -#endif // BUILDFLAG(IS_LINUX) + {ui::VKEY_0, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, - {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, + {ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_MOVE_TAB_NEXT}, + {ui::VKEY_H, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_MOVE_TAB_PREVIOUS}, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) // Control modifier is rarely used on Mac, so we allow it only in several // specific cases. - {ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB}, - {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB}, + {ui::VKEY_L, ui::EF_ALT_DOWN, IDC_SELECT_NEXT_TAB}, + {ui::VKEY_H, ui::EF_ALT_DOWN, IDC_SELECT_PREVIOUS_TAB}, {ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB}, @@ -121,9 +116,10 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, + {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_TAB_8}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, #endif // BUILDFLAG(IS_LINUX) - {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, + {ui::VKEY_B, ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, {ui::VKEY_SUBTRACT, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, @@ -142,6 +138,8 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE}, {ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE}, {ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE}, + {ui::VKEY_J, ui::EF_PLATFORM_ACCELERATOR, IDC_FOCUS_NEXT_PANE}, + {ui::VKEY_K, ui::EF_PLATFORM_ACCELERATOR, IDC_FOCUS_PREVIOUS_PANE}, {ui::VKEY_F6, ui::EF_CONTROL_DOWN, IDC_FOCUS_WEB_CONTENTS_PANE}, #if BUILDFLAG(IS_CHROMEOS_ASH) // On Chrome OS, Control + Search + 7 toggles caret browsing. @@ -149,14 +147,14 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_F7, ui::EF_CONTROL_DOWN, IDC_CARET_BROWSING_TOGGLE}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) {ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, - {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN}, + {ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_FULLSCREEN}, {ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, - {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, + {ui::VKEY_H, ui::EF_PLATFORM_ACCELERATOR | ui::EF_SHIFT_DOWN, IDC_BACK}, + {ui::VKEY_L, ui::EF_PLATFORM_ACCELERATOR | ui::EF_SHIFT_DOWN, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD}, {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE}, @@ -193,13 +191,14 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN, IDC_TASK_MANAGER}, {ui::VKEY_Z, ui::EF_COMMAND_DOWN, IDC_TOGGLE_MULTITASK_MENU}, #else // BUILDFLAG(IS_CHROMEOS) - {ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER_SHORTCUT}, + {ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_TASK_MANAGER_SHORTCUT}, {ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, {ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, {ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are // handled via WM_APPCOMMAND. {ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH}, + {ui::VKEY_Q, ui::EF_PLATFORM_ACCELERATOR, IDC_EXIT}, #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -219,24 +218,23 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK}, {ui::VKEY_LEFT, ui::EF_ALTGR_DOWN, IDC_BACK}, #if BUILDFLAG(ENABLE_PRINTING) - {ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, + {ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_BASIC_PRINT}, #endif // ENABLE_PRINTING {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_BOOKMARKS}, {ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY}, - {ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION}, - {ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH}, - {ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH}, + {ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION}, + {ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH}, {ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_TOOLBAR}, {ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD}, {ui::VKEY_RIGHT, ui::EF_ALTGR_DOWN, IDC_FORWARD}, {ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME}, - {ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, + {ui::VKEY_M, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, {ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, - {ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, + {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_MANAGER}, - {ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS}, - {ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY}, + {ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_DOWNLOADS}, + {ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_HISTORY}, #if !BUILDFLAG(IS_CHROMEOS) // On Chrome OS, these keys are assigned to change UI scale. {ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, @@ -256,12 +254,11 @@ const AcceleratorMapping kAcceleratorMap[] = { }; const AcceleratorMapping kDevToolsAcceleratorMap[] = { - {ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE}, + {ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_DEV_TOOLS_TOGGLE}, #if !BUILDFLAG(IS_MAC) - {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS}, - {ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, - IDC_DEV_TOOLS_CONSOLE}, {ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, + IDC_DEV_TOOLS_CONSOLE}, + {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS_INSPECT}, {ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE}, #endif // !BUILDFLAG(IS_MAC)