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

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: Add ash::wm::ToggleMaximizedWindow to window_util.h 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
« no previous file with comments | « ash/accelerators/accelerator_controller.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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 const AcceleratorAction kReservedActions[] = { 191 const AcceleratorAction kReservedActions[] = {
192 // Window cycling accelerators. 192 // Window cycling accelerators.
193 CYCLE_BACKWARD_MRU_PRESSED, // Shift+Alt+Tab 193 CYCLE_BACKWARD_MRU_PRESSED, // Shift+Alt+Tab
194 CYCLE_BACKWARD_MRU_RELEASED, 194 CYCLE_BACKWARD_MRU_RELEASED,
195 CYCLE_FORWARD_MRU_PRESSED, // Alt+Tab 195 CYCLE_FORWARD_MRU_PRESSED, // Alt+Tab
196 CYCLE_FORWARD_MRU_RELEASED, 196 CYCLE_FORWARD_MRU_RELEASED,
197 #if defined(OS_CHROMEOS) 197 #if defined(OS_CHROMEOS)
198 POWER_PRESSED, 198 POWER_PRESSED,
199 POWER_RELEASED, 199 POWER_RELEASED,
200 TOGGLE_MAXIMIZED_PRESSED,
201 TOGGLE_MAXIMIZED_RELEASED,
202 #endif 200 #endif
203 }; 201 };
204 202
205 const size_t kReservedActionsLength = arraysize(kReservedActions); 203 const size_t kReservedActionsLength = arraysize(kReservedActions);
206 204
207 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { 205 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
208 BRIGHTNESS_DOWN, 206 BRIGHTNESS_DOWN,
209 BRIGHTNESS_UP, 207 BRIGHTNESS_UP,
210 #if defined(OS_CHROMEOS) 208 #if defined(OS_CHROMEOS)
211 CYCLE_DISPLAY_MODE, 209 CYCLE_DISPLAY_MODE,
(...skipping 27 matching lines...) Expand all
239 arraysize(kActionsAllowedAtLoginOrLockScreen); 237 arraysize(kActionsAllowedAtLoginOrLockScreen);
240 238
241 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 239 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
242 EXIT, 240 EXIT,
243 }; 241 };
244 242
245 const size_t kActionsAllowedAtLockScreenLength = 243 const size_t kActionsAllowedAtLockScreenLength =
246 arraysize(kActionsAllowedAtLockScreen); 244 arraysize(kActionsAllowedAtLockScreen);
247 245
248 } // namespace ash 246 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698