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

Side by Side Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 23611005: ash: Allow web pages to use the Ctrl-M minimize shortcut (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/accelerator_table.h" 5 #include "chrome/browser/ui/views/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "ui/base/accelerators/accelerator.h" 9 #include "ui/base/accelerators/accelerator.h"
10 #include "ui/base/events/event_constants.h" 10 #include "ui/base/events/event_constants.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, 116 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD },
117 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, 117 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD },
118 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 118 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
119 IDC_HELP_PAGE_VIA_KEYBOARD }, 119 IDC_HELP_PAGE_VIA_KEYBOARD },
120 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, 120 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME },
121 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, 121 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD },
122 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, 122 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE },
123 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, 123 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
124 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, 124 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER },
125 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, 125 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP },
126 // Not implemented inside Ash to allow web pages to capture the key.
127 { ui::VKEY_M, ui::EF_CONTROL_DOWN, IDC_MINIMIZE_WINDOW },
126 #else // OS_CHROMEOS 128 #else // OS_CHROMEOS
127 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 129 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
128 IDC_CLEAR_BROWSING_DATA }, 130 IDC_CLEAR_BROWSING_DATA },
129 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, 131 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
130 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, 132 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
131 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, 133 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
132 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled 134 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled
133 // via WM_APPCOMMAND. 135 // via WM_APPCOMMAND.
134 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, 136 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH },
135 { ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU}, 137 { ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU},
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); 221 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
220 return true; 222 return true;
221 case IDC_PASTE: 223 case IDC_PASTE:
222 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); 224 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
223 return true; 225 return true;
224 } 226 }
225 return false; 227 return false;
226 } 228 }
227 229
228 } // namespace chrome 230 } // namespace chrome
OLDNEW
« ash/accelerators/accelerator_commands.h ('K') | « chrome/browser/ui/browser_command_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698