Aura: New window shadows, desktop background debug toggle

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 5b0f42c33003be7f43429f8d8dd80bb5821aa049..611d256d21a0d3f5c9404493129b5bd663401fa9 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -46,6 +46,7 @@ enum AcceleratorAction {
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
   TOGGLE_COMPACT_WINDOW_MODE,
+  TOGGLE_DESKTOP_BACKGROUND_MODE,
   TOGGLE_ROOT_WINDOW_FULL_SCREEN,
 #endif
 };
@@ -84,6 +85,7 @@ struct AcceleratorData {
 #if !defined(NDEBUG)
   { ui::VKEY_HOME, false, true, false, ROTATE_SCREEN },
   { ui::VKEY_A, false, true, true, TOGGLE_COMPACT_WINDOW_MODE },
+  { ui::VKEY_B, false, true, true, TOGGLE_DESKTOP_BACKGROUND_MODE },
   { ui::VKEY_F11, false, true, false, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
   { ui::VKEY_L, false, false, true, PRINT_LAYER_HIERARCHY },
   { ui::VKEY_L, true, false, true, PRINT_WINDOW_HIERARCHY },
@@ -159,6 +161,15 @@ bool HandleToggleCompactWindowMode() {
   return true;
 }
 
+bool HandleToggleDesktopBackgroundMode() {
+  ash::Shell* shell = ash::Shell::GetInstance();
+  if (shell->desktop_background_mode() == ash::Shell::BACKGROUND_IMAGE)
+    shell->SetDesktopBackgroundMode(ash::Shell::BACKGROUND_SOLID_COLOR);
+  else
+    shell->SetDesktopBackgroundMode(ash::Shell::BACKGROUND_IMAGE);
+  return true;
+}
+
 bool HandleToggleRootWindowFullScreen() {
   aura::RootWindow::GetInstance()->ToggleFullScreen();
   return true;
@@ -321,6 +332,8 @@ bool AcceleratorController::AcceleratorPressed(
       return HandleRotateScreen();
     case TOGGLE_COMPACT_WINDOW_MODE:
       return HandleToggleCompactWindowMode();
+    case TOGGLE_DESKTOP_BACKGROUND_MODE:
+      return HandleToggleDesktopBackgroundMode();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
     case PRINT_LAYER_HIERARCHY: