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

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

Issue 10736061: Enable debug logging for views::View (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile glitch in release Created 8 years, 5 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_table.h ('k') | ui/views/debug_utils.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 #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 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // For testing on systems where Alt-Tab is already mapped. 131 // For testing on systems where Alt-Tab is already mapped.
132 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 132 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
133 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 133 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
134 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE }, 134 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
135 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE }, 135 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
136 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 136 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
137 DISPLAY_TOGGLE_SCALE }, 137 DISPLAY_TOGGLE_SCALE },
138 #if !defined(NDEBUG) 138 #if !defined(NDEBUG)
139 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 139 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
140 PRINT_LAYER_HIERARCHY }, 140 PRINT_LAYER_HIERARCHY },
141 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
142 PRINT_VIEW_HIERARCHY },
141 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 143 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
142 PRINT_WINDOW_HIERARCHY }, 144 PRINT_WINDOW_HIERARCHY },
143 #endif 145 #endif
144 146
145 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, 147 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE,
146 // VKEY_MEDIA_LAUNCH_MAIL, and VKEY_MEDIA_LAUNCH_APP2 (aka Calculator button). 148 // VKEY_MEDIA_LAUNCH_MAIL, and VKEY_MEDIA_LAUNCH_APP2 (aka Calculator button).
147 }; 149 };
148 150
149 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 151 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
150 152
(...skipping 18 matching lines...) Expand all
169 TAKE_SCREENSHOT, 171 TAKE_SCREENSHOT,
170 TAKE_PARTIAL_SCREENSHOT, 172 TAKE_PARTIAL_SCREENSHOT,
171 TOGGLE_CAPS_LOCK, 173 TOGGLE_CAPS_LOCK,
172 TOGGLE_SPOKEN_FEEDBACK, 174 TOGGLE_SPOKEN_FEEDBACK,
173 VOLUME_DOWN, 175 VOLUME_DOWN,
174 VOLUME_MUTE, 176 VOLUME_MUTE,
175 VOLUME_UP, 177 VOLUME_UP,
176 ROTATE_WINDOWS, 178 ROTATE_WINDOWS,
177 #if !defined(NDEBUG) 179 #if !defined(NDEBUG)
178 PRINT_LAYER_HIERARCHY, 180 PRINT_LAYER_HIERARCHY,
181 PRINT_VIEW_HIERARCHY,
179 PRINT_WINDOW_HIERARCHY, 182 PRINT_WINDOW_HIERARCHY,
180 ROTATE_SCREEN, 183 ROTATE_SCREEN,
181 #endif 184 #endif
182 }; 185 };
183 186
184 const size_t kActionsAllowedAtLoginOrLockScreenLength = 187 const size_t kActionsAllowedAtLoginOrLockScreenLength =
185 arraysize(kActionsAllowedAtLoginOrLockScreen); 188 arraysize(kActionsAllowedAtLoginOrLockScreen);
186 189
187 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 190 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
188 EXIT, 191 EXIT,
189 }; 192 };
190 193
191 const size_t kActionsAllowedAtLockScreenLength = 194 const size_t kActionsAllowedAtLockScreenLength =
192 arraysize(kActionsAllowedAtLockScreen); 195 arraysize(kActionsAllowedAtLockScreen);
193 196
194 } // namespace ash 197 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ui/views/debug_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698