Rename ash desktop_background to wallpaper.

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 <map>
 #include <memory>
 
@@ skipping 33 matching lines @@
 
 namespace wm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 class ScopedCaptureClient;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class AlwaysOnTopController;
-class AnimatingDesktopController;
-class DesktopBackgroundWidgetController;
+class AnimatingWallpaperWidgetController;
 class DockedWindowLayoutManager;
 enum class LoginStatus;
 class PanelLayoutManager;
 class RootWindowControllerCommon;
 class Shelf;
 class ShelfLayoutManager;
 class ShelfWidget;
 class StackingController;
 class StatusAreaWidget;
-class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
 class SystemTray;
+class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
+class WallpaperWidgetController;
 class WmShelfAura;
 class WmWindow;
 class WorkspaceController;
 
 #if defined(OS_CHROMEOS)
 class BootSplashScreen;
 class AshTouchExplorationManager;
 #endif
 
 // This class maintains the per root window state for ash. This class
@@ skipping 54 matching lines @@
 
   // Set touch HUDs for this root window controller. The root window controller
   // will not own the HUDs; their lifetimes are managed by themselves. Whenever
   // the widget showing a HUD is being destroyed (e.g. because of detaching a
   // display), the HUD deletes itself.
   void set_touch_hud_debug(TouchHudDebug* hud) { touch_hud_debug_ = hud; }
   void set_touch_hud_projection(TouchHudProjection* hud) {
     touch_hud_projection_ = hud;
   }
 
-  DesktopBackgroundWidgetController* wallpaper_controller() {
-    return wallpaper_controller_.get();
+  WallpaperWidgetController* wallpaper_widget_controller() {
+    return wallpaper_widget_controller_.get();
   }
-  void SetWallpaperController(DesktopBackgroundWidgetController* controller);
-  AnimatingDesktopController* animating_wallpaper_controller() {
-    return animating_wallpaper_controller_.get();
+  void SetWallpaperWidgetController(WallpaperWidgetController* controller);
+  AnimatingWallpaperWidgetController* animating_wallpaper_widget_controller() {
+    return animating_wallpaper_widget_controller_.get();
   }
-  void SetAnimatingWallpaperController(AnimatingDesktopController* controller);
+  void SetAnimatingWallpaperWidgetController(
+      AnimatingWallpaperWidgetController* controller);
 
   // Access the shelf layout manager associated with this root
   // window controller, NULL if no such shelf exists.
   ShelfLayoutManager* GetShelfLayoutManager();
 
   // Returns the system tray on this root window. Note that
   // calling this on the root window that doesn't have a shelf will
   // lead to a crash.
   SystemTray* GetSystemTray();
 
@@ skipping 27 matching lines @@
 
   // Returns the shelf controller for this root window.
   // TODO(jamescook): Remove this and use WmRootWindowController::GetShelf().
   Shelf* GetShelf() const;
 
   // Called when the login status changes after login (such as lock/unlock).
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(LoginStatus status);
 
   // Called when the brightness/grayscale animation from white to the login
-  // desktop background image has started.  Starts |boot_splash_screen_|'s
-  // hiding animation (if the screen is non-NULL).
-  void HandleInitialDesktopBackgroundAnimationStarted();
+  // wallpaper image has started.  Starts |boot_splash_screen_|'s hiding
+  // animation (if the screen is non-NULL).
+  void HandleInitialWallpaperAnimationStarted();
 
-  // Called when the wallpaper ainmation is finished. Updates |background_|
-  // to be black and drops |boot_splash_screen_| and moves the wallpaper
-  // controller into the root window controller. |widget| holds the wallpaper
-  // image, or NULL if the background is a solid color.
+  // Called when the wallpaper animation is finished. Updates
+  // |system_wallpaper_| to be black and drops |boot_splash_screen_| and moves
+  // the wallpaper controller into the root window controller. |widget| holds
+  // the wallpaper image, or NULL if the wallpaper is a solid color.
   void OnWallpaperAnimationFinished(views::Widget* widget);
 
   // Deletes associated objects and clears the state, but doesn't delete
   // the root window yet. This is used to delete a secondary displays'
   // root window safely when the display disconnect signal is received,
   // which may come while we're in the nested message loop.
   void Shutdown();
 
   // Deletes all child windows and performs necessary cleanup.
   void CloseChildWindows();
@@ skipping 28 matching lines @@
   explicit RootWindowController(AshWindowTreeHost* host);
   enum RootWindowType { PRIMARY, SECONDARY };
 
   // Initializes the RootWindowController.  |is_primary| is true if
   // the controller is for primary display.  |first_run_after_boot| is
   // set to true only for primary root window after boot.
   void Init(RootWindowType root_window_type, bool first_run_after_boot);
 
   void InitLayoutManagers();
 
-  // Initializes |system_background_| and possibly also |boot_splash_screen_|.
-  // |is_first_run_after_boot| determines the background's initial color.
-  void CreateSystemBackground(bool is_first_run_after_boot);
+  // Initializes |system_wallpaper_| and possibly also |boot_splash_screen_|.
+  // |is_first_run_after_boot| determines the wallpaper's initial color.
+  void CreateSystemWallpaper(bool is_first_run_after_boot);
 
   // Enables projection touch HUD.
   void EnableTouchHudProjection();
 
   // Disables projection touch HUD.
   void DisableTouchHudProjection();
 
   // Callback for MenuModelAdapter.
   void OnMenuClosed();
 
@@ skipping 14 matching lines @@
 
   // Legacy shelf controller. Only present after shelf is created (post-login).
   std::unique_ptr<Shelf> shelf_;
 
   // The shelf widget for this root window.
   std::unique_ptr<ShelfWidget> shelf_widget_;
 
   // An invisible/empty window used as a event target for
   // |MouseCursorEventFilter| before a user logs in.
   // (crbug.com/266987)
-  // Its container is |LockScreenBackgroundContainer| and
+  // Its container is |LockScreenWallpaperContainer| and
   // this must be deleted before the container is deleted.
   std::unique_ptr<aura::Window> mouse_event_target_;
 
   // Manages layout of docked windows. Owned by DockedContainer.
   DockedWindowLayoutManager* docked_layout_manager_;
 
   // Manages layout of panels. Owned by PanelContainer.
   PanelLayoutManager* panel_layout_manager_;
 
-  std::unique_ptr<SystemBackgroundController> system_background_;
+  std::unique_ptr<SystemWallpaperController> system_wallpaper_;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<BootSplashScreen> boot_splash_screen_;
   // Responsible for initializing TouchExplorationController when spoken
   // feedback is on.
   std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
 #endif
 
   std::unique_ptr<WorkspaceController> workspace_controller_;
   std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
 
   // Heads-up displays for touch events. These HUDs are not owned by the root
   // window controller and manage their own lifetimes.
   TouchHudDebug* touch_hud_debug_;
   TouchHudProjection* touch_hud_projection_;
 
   // Handles double clicks on the panel window header.
   std::unique_ptr<ui::EventHandler> panel_container_handler_;
 
-  std::unique_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
-  std::unique_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
+  std::unique_ptr<WallpaperWidgetController> wallpaper_widget_controller_;
+  std::unique_ptr<AnimatingWallpaperWidgetController>
+      animating_wallpaper_widget_controller_;
   std::unique_ptr<::wm::ScopedCaptureClient> capture_client_;
 
   // Manages the context menu.
   std::unique_ptr<ui::MenuModel> menu_model_;
   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 // On classic ash, returns the RootWindowController for the given |root_window|.
 // On mus ash, returns the RootWindowController for the primary display.
 // See RootWindowController class comment above.
 ASH_EXPORT RootWindowController* GetRootWindowController(
     const aura::Window* root_window);
 
 }  // namespace ash
 
 #endif  // ASH_ROOT_WINDOW_CONTROLLER_H_