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

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

Issue 2013933002: Fix shelf alignment locking for power button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove compositor DCHECK workaround. Created 4 years, 6 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
« no previous file with comments | « no previous file | ash/shelf/shelf_locking_manager.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 #include "ash/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "ash/strings/grit/ash_strings.h" 7 #include "ash/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 #endif // defined(OS_CHROMEOS) 256 #endif // defined(OS_CHROMEOS)
257 257
258 const AcceleratorData kDebugAcceleratorData[] = { 258 const AcceleratorData kDebugAcceleratorData[] = {
259 #if defined(OS_CHROMEOS) 259 #if defined(OS_CHROMEOS)
260 // Extra shortcut for debug build to control magnifier on linux desktop. 260 // Extra shortcut for debug build to control magnifier on linux desktop.
261 {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, 261 {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
262 MAGNIFY_SCREEN_ZOOM_OUT}, 262 MAGNIFY_SCREEN_ZOOM_OUT},
263 {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, 263 {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
264 // Extra shortcuts to lock the screen on linux desktop. 264 // Extra shortcuts to lock the screen on linux desktop.
265 {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN}, 265 {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_PRESSED},
266 {false, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_RELEASED},
267 {true, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_PRESSED},
268 {false, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_RELEASED},
266 {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED}, 269 {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED},
267 {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED}, 270 {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED},
268 {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 271 {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
269 DEBUG_ADD_REMOVE_DISPLAY}, 272 DEBUG_ADD_REMOVE_DISPLAY},
270 {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 273 {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
271 DEBUG_TOGGLE_UNIFIED_DESKTOP}, 274 DEBUG_TOGGLE_UNIFIED_DESKTOP},
272 {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 275 {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
273 TOGGLE_MIRROR_MODE}, 276 TOGGLE_MIRROR_MODE},
274 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, 277 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
275 DEBUG_TOGGLE_TOUCH_PAD}, 278 DEBUG_TOGGLE_TOUCH_PAD},
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 TOGGLE_WIFI, 557 TOGGLE_WIFI,
555 VOLUME_DOWN, 558 VOLUME_DOWN,
556 VOLUME_MUTE, 559 VOLUME_MUTE,
557 VOLUME_UP, 560 VOLUME_UP,
558 #endif // defined(OS_CHROMEOS) 561 #endif // defined(OS_CHROMEOS)
559 }; 562 };
560 563
561 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 564 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
562 565
563 } // namespace ash 566 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698