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

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

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (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
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 { true, ui::VKEY_HOME, false, true, false, ROTATE_SCREEN }, 99 { true, ui::VKEY_HOME, false, true, false, ROTATE_SCREEN },
100 { true, ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE }, 100 { true, ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE },
101 { true, ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 101 { true, ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
102 { true, ui::VKEY_L, true, true, true, PRINT_LAYER_HIERARCHY }, 102 { true, ui::VKEY_L, true, true, true, PRINT_LAYER_HIERARCHY },
103 { true, ui::VKEY_W, true, true, true, PRINT_WINDOW_HIERARCHY }, 103 { true, ui::VKEY_W, true, true, true, PRINT_WINDOW_HIERARCHY },
104 // For testing on systems where Alt-Tab is already mapped. 104 // For testing on systems where Alt-Tab is already mapped.
105 { true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU }, 105 { true, ui::VKEY_W, false, false, true, CYCLE_FORWARD_MRU },
106 { true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU }, 106 { true, ui::VKEY_W, true, false, true, CYCLE_BACKWARD_MRU },
107 { true, ui::VKEY_F4, false, true, false, ADD_REMOVE_MONITOR }, 107 { true, ui::VKEY_F4, false, true, false, ADD_REMOVE_MONITOR },
108 { true, ui::VKEY_F4, true, true, false, CYCLE_MONITOR }, 108 { true, ui::VKEY_F4, true, true, false, CYCLE_MONITOR },
109 { true, ui::VKEY_HOME, true, true, false, SCALE_MONITOR },
109 #endif 110 #endif
110 // trigger_on_press, KeyboardCode, shift, control, alt, AcceleratorAction 111 // trigger_on_press, KeyboardCode, shift, control, alt, AcceleratorAction
111 }; 112 };
112 113
113 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 114 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
114 115
115 const AcceleratorAction kActionsAllowedAtLoginScreen[] = { 116 const AcceleratorAction kActionsAllowedAtLoginScreen[] = {
116 BRIGHTNESS_DOWN, 117 BRIGHTNESS_DOWN,
117 BRIGHTNESS_UP, 118 BRIGHTNESS_UP,
118 NEXT_IME, 119 NEXT_IME,
(...skipping 11 matching lines...) Expand all
130 PRINT_LAYER_HIERARCHY, 131 PRINT_LAYER_HIERARCHY,
131 PRINT_WINDOW_HIERARCHY, 132 PRINT_WINDOW_HIERARCHY,
132 ROTATE_SCREEN, 133 ROTATE_SCREEN,
133 #endif 134 #endif
134 }; 135 };
135 136
136 const size_t kActionsAllowedAtLoginScreenLength = 137 const size_t kActionsAllowedAtLoginScreenLength =
137 arraysize(kActionsAllowedAtLoginScreen); 138 arraysize(kActionsAllowedAtLoginScreen);
138 139
139 } // namespace ash 140 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698