ash: Clean up system background layer.

ash/root_window_controller.h

 // 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.
 
 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/shelf_types.h"
@@ skipping 15 matching lines @@
 class RootWindowEventFilter;
 }  // namespace shared
 }  // namespace aura
 
 namespace ash {
 class Launcher;
 class ToplevelWindowEventHandler;
 
 namespace internal {
 
-class ColoredWindowController;
 class PanelLayoutManager;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
 class WorkspaceController;
 
 // This class maintains the per root window state for ash. This class
@@ skipping 46 matching lines @@
 
   aura::Window* GetContainer(int container_id);
 
   void InitLayoutManagers();
   void CreateContainers();
 
   // Initializs the RootWindowController for primary display. This
   // creates
   void InitForPrimaryDisplay();
 
-  // Initializes |background_|.  |is_first_run_after_boot| determines the
-  // background's initial color.
+  // Initializes |system_background_|.  |is_first_run_after_boot| determines the
+  // background's initial content.
   void CreateSystemBackground(bool is_first_run_after_boot);
 
   // Initializes |launcher_|.  Does nothing if it's already initialized.
   void CreateLauncher();
 
   // Show launcher view if it was created hidden (before session has started).
   void ShowLauncher();
 
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
@@ skipping 46 matching lines @@
   // The shelf for managing the launcher and the status widget.
   // RootWindowController does not own the shelf. Instead, it is owned
   // by container of the status area.
   ShelfLayoutManager* shelf_;
 
   // Manages layout of panels. Owned by PanelContainer.
   PanelLayoutManager* panel_layout_manager_;
 
   scoped_ptr<Launcher> launcher_;
 
-  // A background layer that's displayed beneath all other layers.  Without
-  // this, portions of the root window that aren't covered by layers will be
-  // painted white; this can show up if e.g. it takes a long time to decode the
-  // desktop background image when displaying the login screen.
-  scoped_ptr<ColoredWindowController> background_;
+  scoped_ptr<SystemBackgroundController> system_background_;
 
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_