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

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

Issue 10831208: Bring ROTATE_WINDOWS out of debug, again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | 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 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or 65 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
66 // NEW_TAB, you also need to modify 66 // NEW_TAB, you also need to modify
67 // ToolbarView::GetAcceleratorForCommandId() in 67 // ToolbarView::GetAcceleratorForCommandId() in
68 // chrome/browser/ui/views/toolbar_view.cc. 68 // chrome/browser/ui/views/toolbar_view.cc.
69 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 69 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
70 NEW_INCOGNITO_WINDOW }, 70 NEW_INCOGNITO_WINDOW },
71 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, 71 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
72 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, 72 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
73 73
74 { true, ui::VKEY_F3,
75 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
76 ROTATE_WINDOWS },
74 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, 77 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR },
75 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, 78 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
76 CYCLE_BACKWARD_LINEAR }, 79 CYCLE_BACKWARD_LINEAR },
77 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 80 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
78 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 81 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
79 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 82 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
80 TAKE_PARTIAL_SCREENSHOT }, 83 TAKE_PARTIAL_SCREENSHOT },
81 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT_BY_PRTSCN_KEY }, 84 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT_BY_PRTSCN_KEY },
82 // On Chrome OS, Search key is mapped to LWIN. 85 // On Chrome OS, Search key is mapped to LWIN.
83 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 86 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, 128 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
126 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, 129 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
127 130
128 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and 131 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and
129 // VKEY_MEDIA_LAUNCH_MAIL. 132 // VKEY_MEDIA_LAUNCH_MAIL.
130 }; 133 };
131 134
132 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 135 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
133 136
134 const AcceleratorData kDebugAcceleratorData[] = { 137 const AcceleratorData kDebugAcceleratorData[] = {
135 { true, ui::VKEY_F3,
136 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
137 ROTATE_WINDOWS },
138 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN }, 138 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
139 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 139 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
140 TOGGLE_DESKTOP_BACKGROUND_MODE }, 140 TOGGLE_DESKTOP_BACKGROUND_MODE },
141 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 141 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
142 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI }, 142 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI },
143 // For testing on systems where Alt-Tab is already mapped. 143 // For testing on systems where Alt-Tab is already mapped.
144 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 144 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
145 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 145 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
146 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE }, 146 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
147 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE }, 147 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 arraysize(kActionsAllowedAtLoginOrLockScreen); 222 arraysize(kActionsAllowedAtLoginOrLockScreen);
223 223
224 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 224 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
225 EXIT, 225 EXIT,
226 }; 226 };
227 227
228 const size_t kActionsAllowedAtLockScreenLength = 228 const size_t kActionsAllowedAtLockScreenLength =
229 arraysize(kActionsAllowedAtLockScreen); 229 arraysize(kActionsAllowedAtLockScreen);
230 230
231 } // namespace ash 231 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698