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

Unified Diff: ash/accelerators/accelerator_controller_delegate_aura.cc

Issue 2323863002: Separate debugging and developer accelerators (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/accelerator_controller_delegate_aura.cc
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
index bb430d3df2a29edb390d669197889c8b90b71c95..521980fcc76e36b684ed0c1fbfe6fe6c51cfb6f3 100644
--- a/ash/accelerators/accelerator_controller_delegate_aura.cc
+++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -370,11 +370,12 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
switch (action) {
case DEBUG_TOGGLE_WALLPAPER_MODE:
case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
- case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
return debug::DebugAcceleratorsEnabled();
+ case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
+ return debug::DeveloperAcceleratorsEnabled();
case MAGNIFY_SCREEN_ZOOM_IN:
case MAGNIFY_SCREEN_ZOOM_OUT:
return CanHandleMagnifyScreen();
@@ -397,7 +398,8 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
#if defined(OS_CHROMEOS)
case DEBUG_ADD_REMOVE_DISPLAY:
case DEBUG_TOGGLE_UNIFIED_DESKTOP:
- return debug::DebugAcceleratorsEnabled();
+ case TOGGLE_MIRROR_MODE:
+ return debug::DeveloperAcceleratorsEnabled();
case SWAP_PRIMARY_DISPLAY:
return display::Screen::GetScreen()->GetNumDisplays() > 1;
@@ -411,7 +413,6 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
case LOCK_RELEASED:
case POWER_PRESSED:
case POWER_RELEASED:
- case TOGGLE_MIRROR_MODE:
case TOUCH_HUD_PROJECTION_TOGGLE:
return true;
#endif
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | ash/common/accelerators/accelerator_table.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698