Index: chrome/browser/ui/views/accelerator_table.cc |
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc |
index d1a069f68382935906782042104dc3d7c7059c10..1a289e48e93fc3caab26dc5d79e5177fb9b7d1e6 100644 |
--- a/chrome/browser/ui/views/accelerator_table.cc |
+++ b/chrome/browser/ui/views/accelerator_table.cc |
@@ -34,43 +34,70 @@ const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN; |
// Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: |
// http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx |
const AcceleratorMapping kAcceleratorMap[] = { |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_OEM_4, kPlatformModifier, IDC_BACK }, |
tapted
2016/06/17 01:05:01
Stuff like OEM_4 needs a comment
themblsha
2016/06/21 15:57:49
Done.
|
+#else // !OS_MACOSX |
{ ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, |
- { ui::VKEY_BACK, ui::EF_NONE, IDC_BACKSPACE_BACK }, |
- { ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE }, |
- { ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
+#endif // !OS_MACOSX |
+ { ui::VKEY_D, kPlatformModifier, IDC_BOOKMARK_PAGE }, |
+ { ui::VKEY_D, ui::EF_SHIFT_DOWN | kPlatformModifier, |
IDC_BOOKMARK_ALL_TABS }, |
- { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, |
- { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, |
- { ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND }, |
- { ui::VKEY_G, ui::EF_CONTROL_DOWN, IDC_FIND_NEXT }, |
- { ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_FIND_PREVIOUS }, |
+ { ui::VKEY_W, kPlatformModifier, IDC_CLOSE_TAB }, |
+ { ui::VKEY_W, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_CLOSE_WINDOW }, |
+ { ui::VKEY_F, kPlatformModifier, IDC_FIND }, |
+ { ui::VKEY_G, kPlatformModifier, IDC_FIND_NEXT }, |
+ { ui::VKEY_G, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_FIND_PREVIOUS }, |
+#if !defined(OS_MACOSX) |
{ ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION }, |
- { ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION }, |
+#endif // !OS_MACOSX |
+ { ui::VKEY_L, kPlatformModifier, IDC_FOCUS_LOCATION }, |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_F, kPlatformModifier | ui::EF_ALT_DOWN, IDC_FOCUS_SEARCH }, |
+#else // !OS_MACOSX |
{ ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, |
{ 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_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_INFOBARS }, |
+#endif // !OS_MACOSX |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_OEM_6, kPlatformModifier, IDC_FORWARD }, |
+#else // !OS_MACOSX |
{ ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, |
- { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_BACKSPACE_FORWARD }, |
+#endif // !OS_MACOSX |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_I, kPlatformModifier | ui::EF_ALT_DOWN, IDC_DEV_TOOLS }, |
+ { ui::VKEY_J, kPlatformModifier | ui::EF_ALT_DOWN, IDC_DEV_TOOLS_CONSOLE }, |
+#else // !OS_MACOSX |
{ ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, |
{ ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, |
{ 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_INSPECT }, |
- { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, |
- { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, |
+#endif // !OS_MACOSX |
+ { ui::VKEY_O, kPlatformModifier, IDC_OPEN_FILE }, |
+ { ui::VKEY_P, kPlatformModifier, IDC_PRINT }, |
#if defined(ENABLE_BASIC_PRINTING) |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_P, ui::EF_ALT_DOWN | kPlatformModifier, IDC_BASIC_PRINT}, |
+#else // !OS_MACOSX |
{ ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, |
+#endif // !OS_MACOSX |
#endif // ENABLE_BASIC_PRINTING |
- { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, |
- { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
+ { ui::VKEY_R, kPlatformModifier, IDC_RELOAD }, |
+ { ui::VKEY_R, ui::EF_SHIFT_DOWN | kPlatformModifier, |
IDC_RELOAD_BYPASSING_CACHE }, |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_H, kPlatformModifier | ui::EF_SHIFT_DOWN, IDC_HOME }, |
+#else // !OS_MACOSX |
{ ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, |
- { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, |
+#endif // !OS_MACOSX |
+ { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, |
+#if !defined(OS_MACOSX) |
{ ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
{ ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, |
+#endif // !OS_MACOSX |
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
{ ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, |
{ ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, |
@@ -78,11 +105,17 @@ const AcceleratorMapping kAcceleratorMap[] = { |
{ ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
IDC_MOVE_TAB_PREVIOUS }, |
#endif |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_RIGHT, kPlatformModifier | ui::EF_ALT_DOWN, IDC_SELECT_NEXT_TAB }, |
+ { ui::VKEY_LEFT, kPlatformModifier | ui::EF_ALT_DOWN, |
+ IDC_SELECT_PREVIOUS_TAB }, |
+#else // !OS_MACOSX |
{ ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, |
{ ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_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 }, |
+#endif // !OS_MACOSX |
{ ui::VKEY_1, kPlatformModifier, IDC_SELECT_TAB_0 }, |
{ ui::VKEY_NUMPAD1, kPlatformModifier, IDC_SELECT_TAB_0 }, |
{ ui::VKEY_2, kPlatformModifier, IDC_SELECT_TAB_1 }, |
@@ -118,22 +151,34 @@ const AcceleratorMapping kAcceleratorMap[] = { |
{ ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, |
{ ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, |
#endif |
- { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
+ { ui::VKEY_B, ui::EF_SHIFT_DOWN | kPlatformModifier, |
IDC_SHOW_BOOKMARK_BAR }, |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_B, kPlatformModifier | ui::EF_ALT_DOWN, |
+ IDC_SHOW_BOOKMARK_MANAGER }, |
+ { ui::VKEY_J, kPlatformModifier | ui::EF_SHIFT_DOWN, IDC_SHOW_DOWNLOADS }, |
+ { ui::VKEY_Y, kPlatformModifier, IDC_SHOW_HISTORY }, |
+#else // !OS_MACOSX |
{ ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
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_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
{ ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
+#endif // !OS_MACOSX |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_OEM_PERIOD, kPlatformModifier, IDC_STOP}, |
+#else // !OS_MACOSX |
{ ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, |
- { ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE }, |
- { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, |
- { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, |
- { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, |
- { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, |
- { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
- { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
+#endif // !OS_MACOSX |
+ { ui::VKEY_U, kPlatformModifier | ui::EF_ALT_DOWN, IDC_VIEW_SOURCE }, |
+ { ui::VKEY_OEM_MINUS, kPlatformModifier, IDC_ZOOM_MINUS }, |
+ { ui::VKEY_SUBTRACT, kPlatformModifier, IDC_ZOOM_MINUS }, |
+ { ui::VKEY_0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
+ { ui::VKEY_NUMPAD0, kPlatformModifier, IDC_ZOOM_NORMAL }, |
+ { ui::VKEY_OEM_PLUS, kPlatformModifier, IDC_ZOOM_PLUS }, |
+ { ui::VKEY_ADD, kPlatformModifier, IDC_ZOOM_PLUS }, |
+#if !defined(OS_MACOSX) |
{ ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, |
{ ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, |
{ ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, |
@@ -146,6 +191,7 @@ const AcceleratorMapping kAcceleratorMap[] = { |
{ ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, |
{ ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, |
{ ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, |
+#endif // !OS_MACOSX |
// Platform-specific key maps. |
#if defined(OS_LINUX) |
@@ -168,7 +214,14 @@ const AcceleratorMapping kAcceleratorMap[] = { |
{ ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, |
{ ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
IDC_TOUCH_HUD_PROJECTION_TOGGLE }, |
-#else // OS_CHROMEOS |
+#elif defined(OS_MACOSX) |
+ { ui::VKEY_Q, kPlatformModifier, IDC_EXIT }, |
+ { ui::VKEY_N, ui::EF_SHIFT_DOWN | kPlatformModifier, |
+ IDC_NEW_INCOGNITO_WINDOW }, |
+ { ui::VKEY_T, kPlatformModifier, IDC_NEW_TAB }, |
+ { ui::VKEY_N, kPlatformModifier, IDC_NEW_WINDOW }, |
+ { ui::VKEY_T, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_RESTORE_TAB }, |
+#else // !OS_MACOSX |
{ ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, |
{ ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
IDC_CLEAR_BROWSING_DATA }, |
@@ -178,7 +231,7 @@ const AcceleratorMapping kAcceleratorMap[] = { |
// 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_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU}, |
+ { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU }, |
// On ChromeOS, these keys are assigned to change UI scale. |
{ ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
{ ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
@@ -194,7 +247,26 @@ const AcceleratorMapping kAcceleratorMap[] = { |
{ ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, |
{ ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, |
{ ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, |
-#endif |
+#endif // !OS_MACOSX |
+ |
+#if defined(OS_MACOSX) |
+ { ui::VKEY_I, kPlatformModifier | ui::EF_SHIFT_DOWN, |
+ IDC_EMAIL_PAGE_LOCATION }, |
+ { ui::VKEY_OEM_2, kPlatformModifier | ui::EF_SHIFT_DOWN, |
+ IDC_HELP_PAGE_VIA_MENU }, |
+ { ui::VKEY_H, kPlatformModifier, IDC_HIDE_APP }, |
+ { ui::VKEY_M, kPlatformModifier, IDC_MINIMIZE_WINDOW }, |
+ |
+ { ui::VKEY_Z, kPlatformModifier, IDC_CONTENT_CONTEXT_UNDO }, |
+ { ui::VKEY_Z, kPlatformModifier | ui::EF_SHIFT_DOWN, |
+ IDC_CONTENT_CONTEXT_REDO }, |
+ { ui::VKEY_X, kPlatformModifier, IDC_CONTENT_CONTEXT_CUT }, |
+ { ui::VKEY_C, kPlatformModifier, IDC_CONTENT_CONTEXT_COPY }, |
+ { ui::VKEY_V, kPlatformModifier, IDC_CONTENT_CONTEXT_PASTE }, |
+ { ui::VKEY_V, kPlatformModifier | ui::EF_SHIFT_DOWN, |
+ IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE }, |
+ { ui::VKEY_A, kPlatformModifier, IDC_CONTENT_CONTEXT_SELECTALL }, |
+#endif // OS_MACOSX |
}; |
const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
@@ -256,13 +328,13 @@ bool GetStandardAcceleratorForCommandId(int command_id, |
// anywhere else. |
switch (command_id) { |
case IDC_CUT: |
- *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN); |
+ *accelerator = ui::Accelerator(ui::VKEY_X, kPlatformModifier); |
return true; |
case IDC_COPY: |
- *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); |
+ *accelerator = ui::Accelerator(ui::VKEY_C, kPlatformModifier); |
return true; |
case IDC_PASTE: |
- *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); |
+ *accelerator = ui::Accelerator(ui::VKEY_V, kPlatformModifier); |
return true; |
} |
return false; |