| Index: ash/common/accelerators/debug_commands.cc
|
| diff --git a/ash/common/accelerators/debug_commands.cc b/ash/common/accelerators/debug_commands.cc
|
| index 0848b309a6e8c76b7e2c1b2d77c81a33fce4428a..1b7d3b20e45b58c9e5805a8c3b88499c3371a49a 100644
|
| --- a/ash/common/accelerators/debug_commands.cc
|
| +++ b/ash/common/accelerators/debug_commands.cc
|
| @@ -127,8 +127,6 @@ void HandleToggleWallpaperMode() {
|
| }
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -
|
| void HandleToggleTouchpad() {
|
| base::RecordAction(base::UserMetricsAction("Accel_Toggle_Touchpad"));
|
| ash::WmShell::Get()->delegate()->ToggleTouchpad();
|
| @@ -150,8 +148,6 @@ void HandleToggleTouchView() {
|
| !controller->IsMaximizeModeWindowManagerEnabled());
|
| }
|
|
|
| -#endif // defined(OS_CHROMEOS)
|
| -
|
| void HandleTriggerCrash() {
|
| CHECK(false) << "Intentional crash via debug accelerator.";
|
| }
|
| @@ -182,7 +178,15 @@ void PerformDebugActionIfEnabled(AcceleratorAction action) {
|
| return;
|
|
|
| switch (action) {
|
| -#if defined(OS_CHROMEOS)
|
| + case DEBUG_PRINT_LAYER_HIERARCHY:
|
| + HandlePrintLayerHierarchy();
|
| + break;
|
| + case DEBUG_PRINT_VIEW_HIERARCHY:
|
| + HandlePrintViewHierarchy();
|
| + break;
|
| + case DEBUG_PRINT_WINDOW_HIERARCHY:
|
| + HandlePrintWindowHierarchy();
|
| + break;
|
| case DEBUG_SHOW_TOAST:
|
| WmShell::Get()->toast_manager()->Show(
|
| ToastData("id", base::ASCIIToUTF16("Toast"), 5000 /* duration_ms */,
|
| @@ -197,19 +201,9 @@ void PerformDebugActionIfEnabled(AcceleratorAction action) {
|
| case DEBUG_TOGGLE_TOUCH_VIEW:
|
| HandleToggleTouchView();
|
| break;
|
| -#endif
|
| case DEBUG_TOGGLE_WALLPAPER_MODE:
|
| HandleToggleWallpaperMode();
|
| break;
|
| - case DEBUG_PRINT_LAYER_HIERARCHY:
|
| - HandlePrintLayerHierarchy();
|
| - break;
|
| - case DEBUG_PRINT_VIEW_HIERARCHY:
|
| - HandlePrintViewHierarchy();
|
| - break;
|
| - case DEBUG_PRINT_WINDOW_HIERARCHY:
|
| - HandlePrintWindowHierarchy();
|
| - break;
|
| case DEBUG_TRIGGER_CRASH:
|
| HandleTriggerCrash();
|
| break;
|
|
|