Aura: New window shadows, desktop background debug toggle

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 197 matching lines @@
     : root_filter_(new internal::RootWindowEventFilter),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
 #if !defined(OS_MACOSX)
       nested_dispatcher_controller_(new NestedDispatcherController),
       accelerator_controller_(new AcceleratorController),
 #endif
       delegate_(delegate),
       shelf_(NULL),
       dynamic_window_mode_(false),
       window_mode_(MODE_OVERLAPPING),
+      desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
   // Pass ownership of the filter to the root window.
   aura::RootWindow::GetInstance()->SetEventFilter(root_filter_);
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
@@ skipping 227 matching lines @@
 
 void Shell::SetWindowModeForMonitorSize(const gfx::Size& monitor_size) {
   // If we're running on a device, a resolution change means the user plugged in
   // or unplugged an external monitor. Change window mode to be appropriate for
   // the new screen resolution.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   WindowMode new_mode = ComputeWindowMode(monitor_size, command_line);
   ChangeWindowMode(new_mode);
 }
 
+void Shell::SetDesktopBackgroundMode(BackgroundMode mode) {
+  if (mode == BACKGROUND_SOLID_COLOR) {
+    // Set a solid black background.
+    // TODO(derat): Remove this in favor of having the compositor only clear the
+    // viewport when there are regions not covered by a layer:
+    // http://crbug.com/113445
+    ui::Layer* background_layer = new ui::Layer(ui::Layer::LAYER_SOLID_COLOR);
+    background_layer->SetColor(SK_ColorBLACK);
+    GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->
+        layer()->Add(background_layer);
+    root_window_layout_->SetBackgroundLayer(background_layer);
+    root_window_layout_->SetBackgroundWidget(NULL);
+  } else {
+    // Create the desktop background image.
+    root_window_layout_->SetBackgroundLayer(NULL);
+    root_window_layout_->SetBackgroundWidget(
+        internal::CreateDesktopBackground());
+  }
+  desktop_background_mode_ = mode;
+}
+
 bool Shell::IsScreenLocked() const {
   const aura::Window* lock_screen_container = GetContainer(
       internal::kShellWindowId_LockScreenContainer);
   return lock_screen_container->StopsEventPropagation();
 }
 
 bool Shell::IsModalWindowOpen() const {
   aura::Window* modal_container =
       ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_SystemModalContainer);
@@ skipping 61 matching lines @@
   default_container->SetLayoutManager(compact_layout_manager);
 
   // Keep the launcher for its data model, but hide it.  Do this before
   // maximizing the windows so the work area is the right size.
   launcher_->widget()->Hide();
 
   // Maximize all the windows, using the new layout manager.
   MaximizeWindows(default_container);
 
   // Set a solid black background.
-  // TODO(derat): Remove this in favor of having the compositor only clear the
-  // viewport when there are regions not covered by a layer:
-  // http://crbug.com/113445
-  ui::Layer* background_layer = new ui::Layer(ui::Layer::LAYER_SOLID_COLOR);
-  background_layer->SetColor(SK_ColorBLACK);
-  GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)->
-      layer()->Add(background_layer);
-  root_window_layout_->SetBackgroundLayer(background_layer);
-  root_window_layout_->SetBackgroundWidget(NULL);
+  SetDesktopBackgroundMode(BACKGROUND_SOLID_COLOR);
 }
 
 void Shell::SetupNonCompactWindowMode() {
   DCHECK(root_window_layout_);
   DCHECK(status_widget_);
 
   // Clean out the old layout managers before we start.
   ResetLayoutManager(internal::kShellWindowId_DefaultContainer);
   ResetLayoutManager(internal::kShellWindowId_LauncherContainer);
   ResetLayoutManager(internal::kShellWindowId_StatusContainer);
@@ skipping 27 matching lines @@
   }
   // Ensure launcher is visible.
   launcher_->widget()->Show();
 
   // Restore all maximized windows.  Don't change full screen windows, as we
   // don't want to disrupt a user trying to plug in an external monitor to
   // give a presentation.
   RestoreMaximizedWindows(default_container);
 
   // Create the desktop background image.
-  root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground());
-  root_window_layout_->SetBackgroundLayer(NULL);
+  SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash