Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tue Nov 4 16:01:27 PST 2014 Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/common.gypi ('K') | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | printing/printing_context_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 363d519e8e8a809a7f85756cecd2166c35fc2a62..023d90ee866b83372c58ae806fbaaeffc046eb47 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -21,168 +21,184 @@ namespace {
// 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[] = {
- { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK },
- { ui::VKEY_BACK, ui::EF_NONE, IDC_BACK },
- { ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE },
- { ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- 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_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION },
- { ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION },
- { 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 },
- { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD },
- { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD },
- { 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},
-#if !defined(DISABLE_BASIC_PRINTING)
- { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT},
-#endif // !DISABLE_BASIC_PRINTING
- { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD },
- { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_RELOAD_IGNORING_CACHE },
- { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
- { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
- { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
- { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
+ {ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK},
+ {ui::VKEY_BACK, ui::EF_NONE, IDC_BACK},
+ {ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE},
+ {ui::VKEY_D,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ 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_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION},
+ {ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION},
+ {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},
+ {ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD},
+ {ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD},
+ {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},
+#if defined(ENABLE_BASIC_PRINTING)
+ {ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT},
+#endif // ENABLE_BASIC_PRINTING
+ {ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD},
+ {ui::VKEY_R,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_RELOAD_IGNORING_CACHE},
+ {ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME},
+ {ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE},
+ {ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB},
+ {ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB},
#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 },
- { 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,
- IDC_MOVE_TAB_PREVIOUS },
+ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
+ {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
+ {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,
+ IDC_MOVE_TAB_PREVIOUS},
#endif
- { 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 },
- { ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 },
- { ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 },
- { ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 },
- { ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 },
- { ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 },
- { ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 },
- { ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 },
- { ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 },
- { ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 },
- { ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 },
- { ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 },
- { ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 },
- { ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 },
- { ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 },
- { ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 },
- { ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 },
+ {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},
+ {ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0},
+ {ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0},
+ {ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1},
+ {ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1},
+ {ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2},
+ {ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2},
+ {ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3},
+ {ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3},
+ {ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4},
+ {ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4},
+ {ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5},
+ {ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5},
+ {ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6},
+ {ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6},
+ {ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7},
+ {ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7},
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
- { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
- { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
- { ui::VKEY_NUMPAD2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
- { ui::VKEY_3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 },
- { ui::VKEY_NUMPAD3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 },
- { ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 },
- { ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 },
- { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 },
- { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 },
- { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 },
- { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 },
- { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 },
- { 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_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR },
+ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
+ {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
+ {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
+ {ui::VKEY_NUMPAD2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
+ {ui::VKEY_3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2},
+ {ui::VKEY_NUMPAD3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2},
+ {ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3},
+ {ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3},
+ {ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4},
+ {ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4},
+ {ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5},
+ {ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5},
+ {ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6},
+ {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_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR},
#endif
- { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_SHOW_BOOKMARK_BAR },
- { 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},
- { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP },
- { ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_TOGGLE_SPEECH_INPUT },
- { 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 },
- { 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 },
- { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB },
- { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW },
- { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD },
- { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE },
- { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
- { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE },
- { 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 },
- { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
+ {ui::VKEY_B,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_SHOW_BOOKMARK_BAR},
+ {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},
+ {ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP},
+ {ui::VKEY_OEM_PERIOD,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_TOGGLE_SPEECH_INPUT},
+ {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},
+ {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},
+ {ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB},
+ {ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW},
+ {ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD},
+ {ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE},
+ {ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE},
+ {ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE},
+ {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},
+ {ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER},
// Platform-specific key maps.
#if defined(OS_LINUX)
- { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK },
- { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, 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_IGNORING_CACHE },
- { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
+ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
+ {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, 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_IGNORING_CACHE},
+ {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE},
#endif // defined(OS_LINUX)
#if defined(OS_CHROMEOS)
- // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash.
- { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_CLEAR_BROWSING_DATA },
- { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD },
- { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_HELP_PAGE_VIA_KEYBOARD },
- { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER },
- { 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 },
+ // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash.
+ {ui::VKEY_BACK,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_CLEAR_BROWSING_DATA},
+ {ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD},
+ {ui::VKEY_OEM_2,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_HELP_PAGE_VIA_KEYBOARD},
+ {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER},
+ {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
- { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_CLEAR_BROWSING_DATA },
- { 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_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 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,
- IDC_ZOOM_MINUS },
+ {ui::VKEY_DELETE,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_CLEAR_BROWSING_DATA},
+ {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_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 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,
+ IDC_ZOOM_MINUS},
// For each entry here add an entry into kChromeCmdId2AshActionId below
// if Ash has a corresponding accelerator.
#if defined(GOOGLE_CHROME_BUILD)
- { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK },
+ {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK},
#endif
- { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT },
- { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
- IDC_NEW_INCOGNITO_WINDOW },
- { 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 },
+ {ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT},
+ {ui::VKEY_N,
+ ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+ IDC_NEW_INCOGNITO_WINDOW},
+ {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
};
const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
« build/common.gypi ('K') | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | printing/printing_context_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698