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

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 11578044: Enable Search-key modifiers for extended key shortcuts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 years 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
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 { true, ui::VKEY_BROWSER_REFRESH, 99 { true, ui::VKEY_BROWSER_REFRESH,
100 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 100 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
101 ROTATE_WINDOWS }, 101 ROTATE_WINDOWS },
102 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, 102 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
103 CYCLE_BACKWARD_LINEAR }, 103 CYCLE_BACKWARD_LINEAR },
104 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 104 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
105 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 105 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
106 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should 106 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
107 // act on release instead of press when using Search as a modifier key for 107 // act on release instead of press when using Search as a modifier key for
108 // extended keyboard shortcuts. 108 // extended keyboard shortcuts.
109 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
110 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 109 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
111 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED }, 110 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED },
112 { true, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, 111 { true, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK },
113 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 112 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
114 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 113 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
115 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 114 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
116 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 115 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
117 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 116 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
118 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 117 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
119 SHOW_KEYBOARD_OVERLAY }, 118 SHOW_KEYBOARD_OVERLAY },
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 CYCLE_BACKWARD_MRU, 281 CYCLE_BACKWARD_MRU,
283 CYCLE_FORWARD_LINEAR, 282 CYCLE_FORWARD_LINEAR,
284 CYCLE_FORWARD_MRU, 283 CYCLE_FORWARD_MRU,
285 TOGGLE_MAXIMIZED, 284 TOGGLE_MAXIMIZED,
286 }; 285 };
287 286
288 const size_t kNonrepeatableActionsLength = 287 const size_t kNonrepeatableActionsLength =
289 arraysize(kNonrepeatableActions); 288 arraysize(kNonrepeatableActions);
290 289
291 } // namespace ash 290 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698