Folds WmRootWindowController into RootWindowController

ash/common/wallpaper/wallpaper_widget_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_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
 #define ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 
-class WmRootWindowController;
+class RootWindowController;
 class WmWindow;
 
 // This class implements a widget-based wallpaper.
 // WallpaperWidgetController is owned by RootWindowController.
 // When the animation completes the old WallpaperWidgetController is
 // destroyed. Exported for tests.
 class ASH_EXPORT WallpaperWidgetController : public views::WidgetObserver,
                                              public WmWindowObserver {
  public:
   explicit WallpaperWidgetController(views::Widget* widget);
   ~WallpaperWidgetController() override;
 
   // Overridden from views::WidgetObserver.
   void OnWidgetDestroying(views::Widget* widget) override;
 
   // Set bounds for the widget that draws the wallpaper.
   void SetBounds(const gfx::Rect& bounds);
 
   // Move the wallpaper for |root_window| to the specified |container|.
   // The lock screen moves the wallpaper container to hides the user's windows.
   // Returns true if there was something to reparent.
   bool Reparent(WmWindow* root_window, int container);
 
   // Starts wallpaper fade in animation. |root_window_controller| is
   // the root window where the animation will happen. (This is
   // necessary this as |layer_| doesn't have access to the root window).
-  void StartAnimating(WmRootWindowController* root_window_controller);
+  void StartAnimating(RootWindowController* root_window_controller);
 
   views::Widget* widget() { return widget_; }
 
  private:
   void RemoveObservers();
 
   // WmWindowObserver:
   void OnWindowBoundsChanged(WmWindow* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
@@ skipping 37 matching lines @@
 
  private:
   std::unique_ptr<WallpaperWidgetController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimatingWallpaperWidgetController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WALLPAPER_WALLPAPER_WIDGET_CONTROLLER_H_