ash: Clean up system background layer.

ash/root_window_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/root_window_controller.h"
 
 #include <vector>
 
+#include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/panel_layout_manager.h"
 #include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/shelf_types.h"
 #include "ash/wm/status_area_layout_manager.h"
+#include "ash/wm/system_background_controller.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_properties.h"
-#include "ash/wm/workspace/colored_window_controller.h"
 #include "ash/wm/workspace_controller.h"
+#include "base/command_line.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace ash {
 namespace {
 
-#if defined(OS_CHROMEOS)
-// Color initially used for the system background after the system has first
-// booted.
-const SkColor kBootSystemBackgroundColor = 0xFFFEFEFE;
-#endif
-
 // Creates a new window for use as a container.
 aura::Window* CreateContainer(int window_id,
                               const char* name,
                               aura::Window* parent) {
   aura::Window* container = new aura::Window(NULL);
   container->set_id(window_id);
   container->SetName(name);
   container->Init(ui::LAYER_NOT_DRAWN);
   parent->AddChild(container);
   if (window_id != internal::kShellWindowId_UnparentedControlContainer)
@@ skipping 216 matching lines @@
   if (!delegate || delegate->IsUserLoggedIn())
     CreateLauncher();
 }
 
 void RootWindowController::CreateContainers() {
   CreateContainersInRootWindow(root_window_.get());
 }
 
 void RootWindowController::CreateSystemBackground(
     bool is_first_run_after_boot) {
-  SkColor color = SK_ColorBLACK;
+  SystemBackgroundController::Content initial_content =
+      SystemBackgroundController::CONTENT_BLACK;
 #if defined(OS_CHROMEOS)
-  if (is_first_run_after_boot)
-    color = kBootSystemBackgroundColor;
+  if (is_first_run_after_boot) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kAshCopyHostBackgroundAtBoot)) {
+      initial_content = SystemBackgroundController::CONTENT_COPY_FROM_HOST;
+    } else {
+      initial_content =
+          SystemBackgroundController::CONTENT_CHROME_OS_BOOT_COLOR;
+    }
+  }
 #endif
-  background_.reset(new ColoredWindowController(
-      root_window_->GetChildById(kShellWindowId_SystemBackgroundContainer),
-      "SystemBackground"));
-  background_->SetColor(color);
-  background_->GetWidget()->Show();
+  system_background_.reset(
+      new SystemBackgroundController(root_window_.get(), initial_content));
 }
 
 void RootWindowController::CreateLauncher() {
   if (launcher_.get())
     return;
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container, shelf_));
 
@@ skipping 22 matching lines @@
     shelf_->UpdateVisibilityState();
 }
 
 void RootWindowController::UpdateAfterLoginStatusChange(
     user::LoginStatus status) {
   if (status_area_widget_)
     status_area_widget_->UpdateAfterLoginStatusChange(status);
 }
 
 void RootWindowController::HandleDesktopBackgroundVisible() {
-  if (background_.get())
-    background_->SetColor(SK_ColorBLACK);
+  system_background_->SetContent(SystemBackgroundController::CONTENT_BLACK);
 }
 
 void RootWindowController::CloseChildWindows() {
   // The status area needs to be shut down before the windows are destroyed.
   if (status_area_widget_) {
     status_area_widget_->Shutdown();
     status_area_widget_ = NULL;
   }
 
   // Closing the windows frees the workspace controller.
@@ skipping 105 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 void RootWindowController::CreateContainersInRootWindow(
     aura::RootWindow* root_window) {
   // These containers are just used by PowerButtonController to animate groups
   // of containers simultaneously without messing up the current transformations
   // on those containers. These are direct children of the root window; all of
   // the other containers are their children.
-  // Desktop and lock screen background containers are not part of the
-  // lock animation so they are not included in those animate groups.
+
+  // The desktop background container is not part of the lock animation, so it
+  // is not included in those animate groups.
   // When screen is locked desktop background is moved to lock screen background
   // container (moved back on unlock). We want to make sure that there's an
   // opaque layer occluding the non-lock-screen layers.
-
-  CreateContainer(kShellWindowId_SystemBackgroundContainer,
-                  "SystemBackgroundContainer", root_window);
-
-  aura::Window* desktop_background_containers = CreateContainer(
+  aura::Window* desktop_background_container = CreateContainer(
       kShellWindowId_DesktopBackgroundContainer,
       "DesktopBackgroundContainer",
       root_window);
-  SetChildWindowVisibilityChangesAnimated(desktop_background_containers);
+  SetChildWindowVisibilityChangesAnimated(desktop_background_container);
 
   aura::Window* non_lock_screen_containers = CreateContainer(
       kShellWindowId_NonLockScreenContainersContainer,
       "NonLockScreenContainersContainer",
       root_window);
 
   aura::Window* lock_background_containers = CreateContainer(
       kShellWindowId_LockScreenBackgroundContainer,
       "LockScreenBackgroundContainer",
       root_window);
@@ skipping 117 matching lines @@
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_window) ;
 }
 
 }  // namespace internal
 }  // namespace ash