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

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

Issue 11421055: Add power-user keyboard mode for ChromeOS with Search key acting as a typical Fn key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't avoid remapping Alt-Up etc when a PrefService isn't around Created 8 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 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 "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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, 101 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
102 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, 102 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
103 103
104 { true, ui::VKEY_F3, 104 { true, ui::VKEY_F3,
105 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 105 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
106 ROTATE_WINDOWS }, 106 ROTATE_WINDOWS },
107 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, 107 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
108 CYCLE_BACKWARD_LINEAR }, 108 CYCLE_BACKWARD_LINEAR },
109 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 109 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
110 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 110 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
111 // On Chrome OS, Search key is mapped to LWIN. 111 // On Chrome OS, Search key is mapped to LWIN. Search key bindings should act
112 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 112 // on release instead of press, since the press can be eaten when using Search
113 // as a modifier key for extended keyboard shortcuts.
114 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
Yusuke Sato 2012/11/26 06:09:38 Could you keep the accelerator to be triggered on
danakj 2012/11/26 17:20:16 If we keep it on press, then when the feature is e
Yusuke Sato 2012/11/26 21:15:05 Oh now I understood what you wanted to do. Thanks
113 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_APP_LIST }, 115 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_APP_LIST },
114 { true, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, 116 { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK },
Yusuke Sato 2012/11/26 06:09:38 I guess TOGGLE_CAPS_LOCK is not fired if the user
danakj 2012/11/26 17:20:16 I can make it not rewrite the Search press when an
danakj 2012/11/26 19:36:26 Done.
115 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 117 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
116 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 118 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
117 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 119 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
118 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 120 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
119 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, 121 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY },
120 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 122 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
121 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 123 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
122 SHOW_KEYBOARD_OVERLAY }, 124 SHOW_KEYBOARD_OVERLAY },
123 { true, ui::VKEY_OEM_2, 125 { true, ui::VKEY_OEM_2,
124 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 126 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 CYCLE_BACKWARD_MRU, 283 CYCLE_BACKWARD_MRU,
282 CYCLE_FORWARD_LINEAR, 284 CYCLE_FORWARD_LINEAR,
283 CYCLE_FORWARD_MRU, 285 CYCLE_FORWARD_MRU,
284 TOGGLE_MAXIMIZED, 286 TOGGLE_MAXIMIZED,
285 }; 287 };
286 288
287 const size_t kNonrepeatableActionsLength = 289 const size_t kNonrepeatableActionsLength =
288 arraysize(kNonrepeatableActions); 290 arraysize(kNonrepeatableActions);
289 291
290 } // namespace ash 292 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698