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

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

Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix AcceleratorControllerTest.WindowSnap Created 8 years, 2 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 "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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 const AcceleratorAction kReservedActions[] = { 189 const AcceleratorAction kReservedActions[] = {
190 // Window cycling accelerators. 190 // Window cycling accelerators.
191 CYCLE_BACKWARD_MRU_PRESSED, // Shift+Alt+Tab 191 CYCLE_BACKWARD_MRU_PRESSED, // Shift+Alt+Tab
192 CYCLE_BACKWARD_MRU_RELEASED, 192 CYCLE_BACKWARD_MRU_RELEASED,
193 CYCLE_FORWARD_MRU_PRESSED, // Alt+Tab 193 CYCLE_FORWARD_MRU_PRESSED, // Alt+Tab
194 CYCLE_FORWARD_MRU_RELEASED, 194 CYCLE_FORWARD_MRU_RELEASED,
195 #if defined(OS_CHROMEOS) 195 #if defined(OS_CHROMEOS)
196 POWER_PRESSED, 196 POWER_PRESSED,
197 POWER_RELEASED, 197 POWER_RELEASED,
198 TOGGLE_MAXIMIZED_PRESSED,
199 TOGGLE_MAXIMIZED_RELEASED,
200 #endif 198 #endif
201 }; 199 };
202 200
203 const size_t kReservedActionsLength = arraysize(kReservedActions); 201 const size_t kReservedActionsLength = arraysize(kReservedActions);
204 202
205 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { 203 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
206 BRIGHTNESS_DOWN, 204 BRIGHTNESS_DOWN,
207 BRIGHTNESS_UP, 205 BRIGHTNESS_UP,
208 #if defined(OS_CHROMEOS) 206 #if defined(OS_CHROMEOS)
209 CYCLE_DISPLAY_MODE, 207 CYCLE_DISPLAY_MODE,
(...skipping 27 matching lines...) Expand all
237 arraysize(kActionsAllowedAtLoginOrLockScreen); 235 arraysize(kActionsAllowedAtLoginOrLockScreen);
238 236
239 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 237 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
240 EXIT, 238 EXIT,
241 }; 239 };
242 240
243 const size_t kActionsAllowedAtLockScreenLength = 241 const size_t kActionsAllowedAtLockScreenLength =
244 arraysize(kActionsAllowedAtLockScreen); 242 arraysize(kActionsAllowedAtLockScreen);
245 243
246 } // namespace ash 244 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698