Rename ash desktop_background to wallpaper.

ash/shell.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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 60 matching lines @@
 class VisibilityController;
 class WindowModalityController;
 }
 
 namespace ash {
 
 class AcceleratorControllerDelegateAura;
 class AshNativeCursorManager;
 class AutoclickController;
 class BluetoothNotificationController;
-class DesktopBackgroundController;
 class DisplayChangeObserver;
 class DisplayColorManager;
 class DisplayConfigurationController;
-class WindowTreeHostManager;
 class DisplayErrorObserver;
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class EventTransformationHandler;
 class FirstRunHelper;
 class GPUSupport;
 class HighContrastController;
 class ImmersiveHandlerFactoryAsh;
@@ skipping 27 matching lines @@
 class StylusMetricsRecorder;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class SystemTray;
 class ToplevelWindowEventHandler;
 class TouchTransformerController;
 class TouchObserverHUD;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
 class VideoDetector;
+class WallpaperController;
 class WebNotificationTray;
 class WindowPositioner;
+class WindowTreeHostManager;
 class WmShellAura;
 class WmWindow;
 
 namespace shell {
 class WindowWatcher;
 }
 
 namespace test {
 class ShellTestApi;
 }
@@ skipping 52 matching lines @@
   static const aura::Window* GetContainer(const aura::Window* root_window,
                                           int container_id);
 
   // Returns the list of containers that match |container_id| in
   // all root windows. If |priority_root| is given, the container
   // in the |priority_root| will be inserted at the top of the list.
   static std::vector<aura::Window*> GetContainersFromAllRootWindows(
       int container_id,
       aura::Window* priority_root);
 
-  // Shows the context menu for the background and launcher at
-  // |location_in_screen| (in screen coordinates).
+  // Shows the context menu for the wallpaper and shelf at the screen location.
   void ShowContextMenu(const gfx::Point& location_in_screen,
                        ui::MenuSourceType source_type);
 
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
 
   // Sets work area insets of the display containing |window|, pings observers.
   void SetDisplayWorkAreaInsets(aura::Window* window,
@@ skipping 49 matching lines @@
 
   DisplayManager* display_manager() { return display_manager_.get(); }
   DisplayConfigurationController* display_configuration_controller() {
     return display_configuration_controller_.get();
   }
   ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
   views::corewm::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
-  DesktopBackgroundController* desktop_background_controller() {
-    return desktop_background_controller_.get();
+  WallpaperController* wallpaper_controller() {

[James Cook, 2016/08/30 05:18:19]

optional: It's a bummer that Shell::wallpaper_controller() returns a
WallpaperController, but RootWindowController::wallpaper_controller() returns a
WallpaperWidgetController. Do you think it's worth having the latter be called
wallpaper_widget_controller()? Or is that too much code churn?

[msw, 2016/08/30 16:07:59]

Fixed the RootWindowController accessors (and renamed
AnimationWallpaperWidgetController)

+    return wallpaper_controller_.get();
   }
   LinkHandlerModelFactory* link_handler_model_factory() {
     return link_handler_model_factory_;
   }
   void set_link_handler_model_factory(
       LinkHandlerModelFactory* link_handler_model_factory) {
     link_handler_model_factory_ = link_handler_model_factory;
   }
   PowerButtonController* power_button_controller() {
     return power_button_controller_.get();
@@ skipping 203 matching lines @@
       accelerator_controller_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
-  std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
+  std::unique_ptr<WallpaperController> wallpaper_controller_;
   LinkHandlerModelFactory* link_handler_model_factory_;
   std::unique_ptr<PowerButtonController> power_button_controller_;
   std::unique_ptr<LockStateController> lock_state_controller_;
   std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
   std::unique_ptr<VideoDetector> video_detector_;
   std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
   std::unique_ptr<HighContrastController> high_contrast_controller_;
   std::unique_ptr<MagnificationController> magnification_controller_;
   std::unique_ptr<PartialMagnificationController>
       partial_magnification_controller_;
@@ skipping 81 matching lines @@
   base::SequencedWorkerPool* blocking_pool_;
 
   bool in_mus_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_