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

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

Issue 10382178: Use single "modifiers" field rather than boolean fields. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ui/aura/event.h" 10 #include "ui/aura/event.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 PRINT_WINDOW_HIERARCHY, 67 PRINT_WINDOW_HIERARCHY,
68 ROTATE_SCREEN, 68 ROTATE_SCREEN,
69 TOGGLE_DESKTOP_BACKGROUND_MODE, 69 TOGGLE_DESKTOP_BACKGROUND_MODE,
70 TOGGLE_ROOT_WINDOW_FULL_SCREEN, 70 TOGGLE_ROOT_WINDOW_FULL_SCREEN,
71 #endif 71 #endif
72 }; 72 };
73 73
74 struct AcceleratorData { 74 struct AcceleratorData {
75 bool trigger_on_press; 75 bool trigger_on_press;
76 ui::KeyboardCode keycode; 76 ui::KeyboardCode keycode;
77 bool shift; 77 int modifiers;
78 bool ctrl;
79 bool alt;
80 AcceleratorAction action; 78 AcceleratorAction action;
81 }; 79 };
82 80
83 // Accelerators handled by AcceleratorController. 81 // Accelerators handled by AcceleratorController.
84 ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; 82 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
85 83
86 // The number of elements in kAcceleratorData. 84 // The number of elements in kAcceleratorData.
87 ASH_EXPORT extern const size_t kAcceleratorDataLength; 85 ASH_EXPORT extern const size_t kAcceleratorDataLength;
88 86
89 // Actions allowed while user is not signed in or screen is locked. 87 // Actions allowed while user is not signed in or screen is locked.
90 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; 88 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginScreen[];
91 89
92 // The number of elements in kActionsAllowedAtLoginScreen. 90 // The number of elements in kActionsAllowedAtLoginScreen.
93 ASH_EXPORT extern const size_t kActionsAllowedAtLoginScreenLength; 91 ASH_EXPORT extern const size_t kActionsAllowedAtLoginScreenLength;
94 92
95 } // namespace ash 93 } // namespace ash
96 94
97 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 95 #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