Index: chrome/browser/ui/cocoa/accelerators_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm |
index b90470f4ff9cfdde9d82f656f760570a91a3d6a7..80a5a72056274915e980af5ace030568a30b0ff2 100644 |
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm |
@@ -36,68 +36,73 @@ const struct AcceleratorMapping { |
NSUInteger modifiers; // The Cocoa modifiers. |
ui::KeyboardCode key_code; // The key used for cross-platform compatibility. |
} kAcceleratorMap[] = { |
- // Accelerators used in the toolbar menu. |
- {IDC_CLEAR_BROWSING_DATA, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_BACK}, |
- {IDC_COPY, NSCommandKeyMask, ui::VKEY_C}, |
- {IDC_CUT, NSCommandKeyMask, ui::VKEY_X}, |
- {IDC_DEV_TOOLS, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_I}, |
- {IDC_DEV_TOOLS_CONSOLE, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_J}, |
- {IDC_FIND, NSCommandKeyMask, ui::VKEY_F}, |
- {IDC_FULLSCREEN, NSCommandKeyMask | NSControlKeyMask, ui::VKEY_F}, |
- {IDC_NEW_INCOGNITO_WINDOW, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_N}, |
- {IDC_NEW_TAB, NSCommandKeyMask, ui::VKEY_T}, |
- {IDC_NEW_WINDOW, NSCommandKeyMask, ui::VKEY_N}, |
- {IDC_PASTE, NSCommandKeyMask, ui::VKEY_V}, |
- {IDC_PRINT, NSCommandKeyMask, ui::VKEY_P}, |
- {IDC_RESTORE_TAB, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_T}, |
- {IDC_SAVE_PAGE, NSCommandKeyMask, ui::VKEY_S}, |
- {IDC_SHOW_BOOKMARK_BAR, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_B}, |
- {IDC_SHOW_BOOKMARK_MANAGER, NSCommandKeyMask | NSAlternateKeyMask, |
- ui::VKEY_B}, |
- {IDC_BOOKMARK_PAGE, NSCommandKeyMask, ui::VKEY_D}, |
- {IDC_SHOW_DOWNLOADS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_J}, |
- {IDC_SHOW_HISTORY, NSCommandKeyMask, ui::VKEY_Y}, |
- {IDC_VIEW_SOURCE, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_U}, |
- {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
- {IDC_ZOOM_PLUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_PLUS}, |
- |
- // Accelerators used in MainMenu.xib, but not the toolbar menu. |
- {IDC_HIDE_APP, NSCommandKeyMask, ui::VKEY_H}, |
- {IDC_EXIT, NSCommandKeyMask, ui::VKEY_Q}, |
- {IDC_OPEN_FILE, NSCommandKeyMask, ui::VKEY_O}, |
- {IDC_FOCUS_LOCATION, NSCommandKeyMask, ui::VKEY_L}, |
- {IDC_CLOSE_WINDOW, NSCommandKeyMask, ui::VKEY_W}, |
- {IDC_EMAIL_PAGE_LOCATION, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_I}, |
-#if !defined(DISABLE_BASIC_PRINTING) |
- {IDC_BASIC_PRINT, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_P}, |
-#endif // !DISABLE_BASIC_PRINTING |
- {IDC_CONTENT_CONTEXT_UNDO, NSCommandKeyMask, ui::VKEY_Z}, |
- {IDC_CONTENT_CONTEXT_REDO, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_Z}, |
- {IDC_CONTENT_CONTEXT_CUT, NSCommandKeyMask, ui::VKEY_X}, |
- {IDC_CONTENT_CONTEXT_COPY, NSCommandKeyMask, ui::VKEY_C}, |
- {IDC_CONTENT_CONTEXT_PASTE, NSCommandKeyMask, ui::VKEY_V}, |
- {IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, |
- NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_V}, |
- {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, |
- {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, |
- {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, |
- {IDC_FIND_PREVIOUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_G}, |
- {IDC_ZOOM_PLUS, NSCommandKeyMask, ui::VKEY_OEM_PLUS}, |
- {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
- {IDC_STOP, NSCommandKeyMask, ui::VKEY_OEM_PERIOD}, |
- {IDC_RELOAD, NSCommandKeyMask, ui::VKEY_R}, |
- {IDC_RELOAD_IGNORING_CACHE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_R}, |
- {IDC_PRESENTATION_MODE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_F}, |
- {IDC_ZOOM_NORMAL, NSCommandKeyMask, ui::VKEY_0}, |
- {IDC_HOME, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_H}, |
- {IDC_BACK, NSCommandKeyMask, ui::VKEY_OEM_4}, |
- {IDC_FORWARD, NSCommandKeyMask, ui::VKEY_OEM_6}, |
- {IDC_BOOKMARK_ALL_TABS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_D}, |
- {IDC_MINIMIZE_WINDOW, NSCommandKeyMask, ui::VKEY_M}, |
- {IDC_SELECT_NEXT_TAB, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_RIGHT}, |
- {IDC_SELECT_PREVIOUS_TAB, NSCommandKeyMask | NSAlternateKeyMask, |
- ui::VKEY_LEFT}, |
- {IDC_HELP_PAGE_VIA_MENU, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_2}, |
+ // Accelerators used in the toolbar menu. |
+ {IDC_CLEAR_BROWSING_DATA, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_BACK}, |
+ {IDC_COPY, NSCommandKeyMask, ui::VKEY_C}, |
+ {IDC_CUT, NSCommandKeyMask, ui::VKEY_X}, |
+ {IDC_DEV_TOOLS, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_I}, |
+ {IDC_DEV_TOOLS_CONSOLE, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_J}, |
+ {IDC_FIND, NSCommandKeyMask, ui::VKEY_F}, |
+ {IDC_FULLSCREEN, NSCommandKeyMask | NSControlKeyMask, ui::VKEY_F}, |
+ {IDC_NEW_INCOGNITO_WINDOW, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_N}, |
+ {IDC_NEW_TAB, NSCommandKeyMask, ui::VKEY_T}, |
+ {IDC_NEW_WINDOW, NSCommandKeyMask, ui::VKEY_N}, |
+ {IDC_PASTE, NSCommandKeyMask, ui::VKEY_V}, |
+ {IDC_PRINT, NSCommandKeyMask, ui::VKEY_P}, |
+ {IDC_RESTORE_TAB, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_T}, |
+ {IDC_SAVE_PAGE, NSCommandKeyMask, ui::VKEY_S}, |
+ {IDC_SHOW_BOOKMARK_BAR, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_B}, |
+ {IDC_SHOW_BOOKMARK_MANAGER, |
+ NSCommandKeyMask | NSAlternateKeyMask, |
+ ui::VKEY_B}, |
+ {IDC_BOOKMARK_PAGE, NSCommandKeyMask, ui::VKEY_D}, |
+ {IDC_SHOW_DOWNLOADS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_J}, |
+ {IDC_SHOW_HISTORY, NSCommandKeyMask, ui::VKEY_Y}, |
+ {IDC_VIEW_SOURCE, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_U}, |
+ {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
+ {IDC_ZOOM_PLUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_PLUS}, |
+ |
+ // Accelerators used in MainMenu.xib, but not the toolbar menu. |
+ {IDC_HIDE_APP, NSCommandKeyMask, ui::VKEY_H}, |
+ {IDC_EXIT, NSCommandKeyMask, ui::VKEY_Q}, |
+ {IDC_OPEN_FILE, NSCommandKeyMask, ui::VKEY_O}, |
+ {IDC_FOCUS_LOCATION, NSCommandKeyMask, ui::VKEY_L}, |
+ {IDC_CLOSE_WINDOW, NSCommandKeyMask, ui::VKEY_W}, |
+ {IDC_EMAIL_PAGE_LOCATION, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_I}, |
+#if defined(ENABLE_BASIC_PRINTING) |
+ {IDC_BASIC_PRINT, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_P}, |
+#endif // ENABLE_BASIC_PRINTING |
+ {IDC_CONTENT_CONTEXT_UNDO, NSCommandKeyMask, ui::VKEY_Z}, |
+ {IDC_CONTENT_CONTEXT_REDO, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_Z}, |
+ {IDC_CONTENT_CONTEXT_CUT, NSCommandKeyMask, ui::VKEY_X}, |
+ {IDC_CONTENT_CONTEXT_COPY, NSCommandKeyMask, ui::VKEY_C}, |
+ {IDC_CONTENT_CONTEXT_PASTE, NSCommandKeyMask, ui::VKEY_V}, |
+ {IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, |
+ NSCommandKeyMask | NSShiftKeyMask, |
+ ui::VKEY_V}, |
+ {IDC_CONTENT_CONTEXT_SELECTALL, NSCommandKeyMask, ui::VKEY_A}, |
+ {IDC_FOCUS_SEARCH, NSCommandKeyMask | NSAlternateKeyMask, ui::VKEY_F}, |
+ {IDC_FIND_NEXT, NSCommandKeyMask, ui::VKEY_G}, |
+ {IDC_FIND_PREVIOUS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_G}, |
+ {IDC_ZOOM_PLUS, NSCommandKeyMask, ui::VKEY_OEM_PLUS}, |
+ {IDC_ZOOM_MINUS, NSCommandKeyMask, ui::VKEY_OEM_MINUS}, |
+ {IDC_STOP, NSCommandKeyMask, ui::VKEY_OEM_PERIOD}, |
+ {IDC_RELOAD, NSCommandKeyMask, ui::VKEY_R}, |
+ {IDC_RELOAD_IGNORING_CACHE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_R}, |
+ {IDC_PRESENTATION_MODE, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_F}, |
+ {IDC_ZOOM_NORMAL, NSCommandKeyMask, ui::VKEY_0}, |
+ {IDC_HOME, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_H}, |
+ {IDC_BACK, NSCommandKeyMask, ui::VKEY_OEM_4}, |
+ {IDC_FORWARD, NSCommandKeyMask, ui::VKEY_OEM_6}, |
+ {IDC_BOOKMARK_ALL_TABS, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_D}, |
+ {IDC_MINIMIZE_WINDOW, NSCommandKeyMask, ui::VKEY_M}, |
+ {IDC_SELECT_NEXT_TAB, |
+ NSCommandKeyMask | NSAlternateKeyMask, |
+ ui::VKEY_RIGHT}, |
+ {IDC_SELECT_PREVIOUS_TAB, |
+ NSCommandKeyMask | NSAlternateKeyMask, |
+ ui::VKEY_LEFT}, |
+ {IDC_HELP_PAGE_VIA_MENU, NSCommandKeyMask | NSShiftKeyMask, ui::VKEY_OEM_2}, |
}; |
// Create a Cocoa platform accelerator given a cross platform |key_code| and |