Allow dynamic enabling/disabling of unified desktop

ash/accelerators/accelerator_table.cc

Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index f3a0a49faef600f636d539a9749a6d79a68687e3..3f02fccf3b990a0a35f5f9f56727a8f3087465e4 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -179,50 +179,58 @@ const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
 
 const AcceleratorData kDebugAcceleratorData[] = {
 #if defined(OS_CHROMEOS)
-  // Extra shortcut for debug build to control magnifier on linux desktop.
-  { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
-    MAGNIFY_SCREEN_ZOOM_OUT},
-  { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
-  // Extra shortcuts to lock the screen on linux desktop.
-  { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
-  { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED },
-  { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
-  { true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
-    DEBUG_ADD_REMOVE_DISPLAY },
-  { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
-    TOGGLE_MIRROR_MODE },
-  { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI },
-  // Extra shortcut for display swapping as alt-f4 is taken on linux desktop.
-  { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-    SWAP_PRIMARY_DISPLAY },
+    // Extra shortcut for debug build to control magnifier on linux desktop.
+    {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
+     MAGNIFY_SCREEN_ZOOM_OUT},
+    {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
+    // Extra shortcuts to lock the screen on linux desktop.
+    {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN},
+    {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED},
+    {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED},
+    {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     DEBUG_ADD_REMOVE_DISPLAY},
+    {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     DEBUG_TOGGLE_UNIFIED_DESKTOP},
+    {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     TOGGLE_MIRROR_MODE},
+    {true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI},
+    // Extra shortcut for display swapping as alt-f4 is taken on linux desktop.
+    {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     SWAP_PRIMARY_DISPLAY},
 #endif
-  // Extra shortcut to rotate/scale up/down the screen on linux desktop.
-  { true, ui::VKEY_R,
-    ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN },
-  // For testing on systems where Alt-Tab is already mapped.
-  { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
-  { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN,
-    DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN },
-  { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
-      CYCLE_BACKWARD_MRU },
-  { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE },
-  { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-    TOGGLE_FULLSCREEN },
-  { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_PRINT_LAYER_HIERARCHY },
-  { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_PRINT_VIEW_HIERARCHY },
-  { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_PRINT_WINDOW_HIERARCHY },
-  { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_DEVICE_SCALE_FACTOR },
-  { true, ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_DEBUG_BORDERS },
-  { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_FPS_COUNTER },
-  { true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_PAINT_RECTS },
+    // Extra shortcut to rotate/scale up/down the screen on linux desktop.
+    {true, ui::VKEY_R,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN},
+    // For testing on systems where Alt-Tab is already mapped.
+    {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
+    {true, ui::VKEY_F11, ui::EF_CONTROL_DOWN,
+     DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN},
+    {true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU},
+    {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE},
+    {true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     TOGGLE_FULLSCREEN},
+    {true, ui::VKEY_L,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_PRINT_LAYER_HIERARCHY},
+    {true, ui::VKEY_V,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_PRINT_VIEW_HIERARCHY},
+    {true, ui::VKEY_W,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_PRINT_WINDOW_HIERARCHY},
+    {true, ui::VKEY_S,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_TOGGLE_DEVICE_SCALE_FACTOR},
+    {true, ui::VKEY_B,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_TOGGLE_SHOW_DEBUG_BORDERS},
+    {true, ui::VKEY_F,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_TOGGLE_SHOW_FPS_COUNTER},
+    {true, ui::VKEY_P,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     DEBUG_TOGGLE_SHOW_PAINT_RECTS},
 };
 
 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);