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

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

Issue 10177002: Do not include Ctrl+N and Ctrl+Shift+N in chrome/browser/ui/views/accelerator_table.cc when USE_ASH (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | « no previous file | chrome/browser/ui/views/accelerator_table.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 #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 "ui/aura/event.h" 10 #include "ui/aura/event.h"
10 11
11 namespace ash { 12 namespace ash {
12 13
13 // Please put if/def sections at the end of the bare section and keep the list 14 // Please put if/def sections at the end of the bare section and keep the list
14 // within each section in alphabetical order. 15 // within each section in alphabetical order.
15 enum AcceleratorAction { 16 enum AcceleratorAction {
16 BRIGHTNESS_DOWN, 17 BRIGHTNESS_DOWN,
17 BRIGHTNESS_UP, 18 BRIGHTNESS_UP,
18 CYCLE_BACKWARD_LINEAR, 19 CYCLE_BACKWARD_LINEAR,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 struct AcceleratorData { 65 struct AcceleratorData {
65 bool trigger_on_press; 66 bool trigger_on_press;
66 ui::KeyboardCode keycode; 67 ui::KeyboardCode keycode;
67 bool shift; 68 bool shift;
68 bool ctrl; 69 bool ctrl;
69 bool alt; 70 bool alt;
70 AcceleratorAction action; 71 AcceleratorAction action;
71 }; 72 };
72 73
73 // Accelerators handled by AcceleratorController. 74 // Accelerators handled by AcceleratorController.
74 extern const AcceleratorData kAcceleratorData[]; 75 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
75 76
76 // The number of elements in kAcceleratorData. 77 // The number of elements in kAcceleratorData.
77 extern const size_t kAcceleratorDataLength; 78 ASH_EXPORT extern const size_t kAcceleratorDataLength;
78 79
79 // Actions allowed while user is not signed in or screen is locked. 80 // Actions allowed while user is not signed in or screen is locked.
80 extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; 81 extern const AcceleratorAction kActionsAllowedAtLoginScreen[];
81 82
82 // The number of elements in kActionsAllowedAtLoginScreen. 83 // The number of elements in kActionsAllowedAtLoginScreen.
83 extern const size_t kActionsAllowedAtLoginScreenLength; 84 extern const size_t kActionsAllowedAtLoginScreenLength;
84 85
85 } // namespace ash 86 } // namespace ash
86 87
87 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 88 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698