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

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

Issue 10155015: Process all global shortcuts for Ash after InputMethodEventFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, address comments Created 8 years, 8 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_filter.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 CYCLE_MONITOR, 55 CYCLE_MONITOR,
56 PRINT_LAYER_HIERARCHY, 56 PRINT_LAYER_HIERARCHY,
57 PRINT_WINDOW_HIERARCHY, 57 PRINT_WINDOW_HIERARCHY,
58 ROTATE_SCREEN, 58 ROTATE_SCREEN,
59 TOGGLE_DESKTOP_BACKGROUND_MODE, 59 TOGGLE_DESKTOP_BACKGROUND_MODE,
60 TOGGLE_ROOT_WINDOW_FULL_SCREEN, 60 TOGGLE_ROOT_WINDOW_FULL_SCREEN,
61 #endif 61 #endif
62 }; 62 };
63 63
64 struct AcceleratorData { 64 struct AcceleratorData {
65 ui::EventType type; 65 bool trigger_on_press;
66 ui::KeyboardCode keycode; 66 ui::KeyboardCode keycode;
67 bool shift; 67 bool shift;
68 bool ctrl; 68 bool ctrl;
69 bool alt; 69 bool alt;
70 AcceleratorAction action; 70 AcceleratorAction action;
71 }; 71 };
72 72
73 // Accelerators handled by AcceleratorController. 73 // Accelerators handled by AcceleratorController.
74 extern const AcceleratorData kAcceleratorData[]; 74 extern const AcceleratorData kAcceleratorData[];
75 75
76 // The number of elements in kAcceleratorData. 76 // The number of elements in kAcceleratorData.
77 extern const size_t kAcceleratorDataLength; 77 extern const size_t kAcceleratorDataLength;
78 78
79 // Actions allowed while user is not signed in or screen is locked. 79 // Actions allowed while user is not signed in or screen is locked.
80 extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; 80 extern const AcceleratorAction kActionsAllowedAtLoginScreen[];
81 81
82 // The number of elements in kActionsAllowedAtLoginScreen. 82 // The number of elements in kActionsAllowedAtLoginScreen.
83 extern const size_t kActionsAllowedAtLoginScreenLength; 83 extern const size_t kActionsAllowedAtLoginScreenLength;
84 84
85 } // namespace ash 85 } // namespace ash
86 86
87 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 87 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698