Aura: New window shadows, desktop background debug toggle

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include "ash/brightness_control_delegate.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/launcher/launcher.h"
@@ skipping 32 matching lines @@
   VOLUME_MUTE,
   VOLUME_UP,
 #if defined(OS_CHROMEOS)
   LOCK_SCREEN,
 #endif
 #if !defined(NDEBUG)
   PRINT_LAYER_HIERARCHY,
   PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
   TOGGLE_COMPACT_WINDOW_MODE,
+  TOGGLE_DESKTOP_BACKGROUND_MODE,
   TOGGLE_ROOT_WINDOW_FULL_SCREEN,
 #endif
 };
 
 // Accelerators handled by AcceleratorController.
 const struct AcceleratorData {
   ui::EventType type;
   ui::KeyboardCode keycode;
   bool shift;
   bool ctrl;
@@ skipping 54 matching lines @@
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_VOLUME_DOWN, false, false, false,
     VOLUME_DOWN },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F10, false, false, false, VOLUME_UP },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_VOLUME_UP, false, false, false,
     VOLUME_UP },
 #if !defined(NDEBUG)
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_HOME, false, true, false,
     ROTATE_SCREEN },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_A, false, true, true,
     TOGGLE_COMPACT_WINDOW_MODE },
+  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_B, false, true, true,
+    TOGGLE_DESKTOP_BACKGROUND_MODE },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F11, false, true, false,
     TOGGLE_ROOT_WINDOW_FULL_SCREEN },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, false, false, true,
     PRINT_LAYER_HIERARCHY },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, false, true,
     PRINT_WINDOW_HIERARCHY },
   // For testing on systems where Alt-Tab is already mapped.
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, false, false, true,
     CYCLE_FORWARD },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_W, true, false, true,
@@ skipping 60 matching lines @@
 }
 
 bool HandleToggleCompactWindowMode() {
   if (ash::Shell::GetInstance()->IsWindowModeCompact())
     ash::Shell::GetInstance()->ChangeWindowMode(ash::Shell::MODE_OVERLAPPING);
   else
     ash::Shell::GetInstance()->ChangeWindowMode(ash::Shell::MODE_COMPACT);
   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;
 }
 
 bool HandlePrintLayerHierarchy() {
   aura::RootWindow* root_window = aura::RootWindow::GetInstance();
   ui::PrintLayerHierarchy(root_window->layer(),
                           root_window->last_mouse_location());
   return true;
@@ skipping 157 matching lines @@
       break;
     case SWITCH_IME:
       if (ime_control_delegate_.get())
         return ime_control_delegate_->HandleSwitchIme(accelerator);
       break;
 #if !defined(NDEBUG)
     case ROTATE_SCREEN:
       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:
       return HandlePrintLayerHierarchy();
     case PRINT_WINDOW_HIERARCHY:
       return HandlePrintWindowHierarchy();
 #endif
     default:
       NOTREACHED() << "Unhandled action " << it->second;;
   }
   return false;
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash