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

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

Issue 9837046: Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/accelerators/accelerator_table.cc » ('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 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/aura/event.h" 9 #include "ui/aura/event.h"
10 10
(...skipping 30 matching lines...) Expand all
41 SELECT_WIN_6, 41 SELECT_WIN_6,
42 SELECT_WIN_7, 42 SELECT_WIN_7,
43 SELECT_LAST_WIN, 43 SELECT_LAST_WIN,
44 ROTATE_WINDOWS, 44 ROTATE_WINDOWS,
45 #if !defined(NDEBUG) 45 #if !defined(NDEBUG)
46 PRINT_LAYER_HIERARCHY, 46 PRINT_LAYER_HIERARCHY,
47 PRINT_WINDOW_HIERARCHY, 47 PRINT_WINDOW_HIERARCHY,
48 ROTATE_SCREEN, 48 ROTATE_SCREEN,
49 TOGGLE_DESKTOP_BACKGROUND_MODE, 49 TOGGLE_DESKTOP_BACKGROUND_MODE,
50 TOGGLE_ROOT_WINDOW_FULL_SCREEN, 50 TOGGLE_ROOT_WINDOW_FULL_SCREEN,
51 ADD_REMOVE_MONITOR,
52 CYCLE_MONITOR,
51 #endif 53 #endif
52 }; 54 };
53 55
54 struct AcceleratorData { 56 struct AcceleratorData {
55 ui::EventType type; 57 ui::EventType type;
56 ui::KeyboardCode keycode; 58 ui::KeyboardCode keycode;
57 bool shift; 59 bool shift;
58 bool ctrl; 60 bool ctrl;
59 bool alt; 61 bool alt;
60 AcceleratorAction action; 62 AcceleratorAction action;
61 }; 63 };
62 64
63 // Accelerators handled by AcceleratorController. 65 // Accelerators handled by AcceleratorController.
64 extern const AcceleratorData kAcceleratorData[]; 66 extern const AcceleratorData kAcceleratorData[];
65 67
66 // The number of elements in kAcceleratorData. 68 // The number of elements in kAcceleratorData.
67 extern const size_t kAcceleratorDataLength; 69 extern const size_t kAcceleratorDataLength;
68 70
69 // Actions allowed while screen is locked. 71 // Actions allowed while screen is locked.
70 extern const AcceleratorAction kActionsAllowedWhileLocked[]; 72 extern const AcceleratorAction kActionsAllowedWhileLocked[];
71 73
72 // The number of elements in kActionsAllowedWhileLocked. 74 // The number of elements in kActionsAllowedWhileLocked.
73 extern const size_t kActionsAllowedWhileLockedLength; 75 extern const size_t kActionsAllowedWhileLockedLength;
74 76
75 } // namespace ash 77 } // namespace ash
76 78
77 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 79 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698