Folds WmRootWindowController into RootWindowController

ash/common/wallpaper/wallpaper_widget_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/common/wallpaper/wallpaper_widget_controller.h"
 
 #include "ash/ash_export.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm_lookup.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/root_window_controller.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver,
                                        public views::WidgetObserver {
  public:
-  ShowWallpaperAnimationObserver(WmRootWindowController* root_window_controller,
+  ShowWallpaperAnimationObserver(RootWindowController* root_window_controller,
                                  views::Widget* wallpaper_widget,
                                  bool is_initial_animation)
       : root_window_controller_(root_window_controller),
         wallpaper_widget_(wallpaper_widget),
         is_initial_animation_(is_initial_animation) {
     DCHECK(wallpaper_widget_);
     wallpaper_widget_->AddObserver(this);
   }
 
   ~ShowWallpaperAnimationObserver() override {
@@ skipping 10 matching lines @@
   }
 
   void OnImplicitAnimationsCompleted() override {
     root_window_controller_->OnWallpaperAnimationFinished(wallpaper_widget_);
     delete this;
   }
 
   // Overridden from views::WidgetObserver.
   void OnWidgetDestroying(views::Widget* widget) override { delete this; }
 
-  WmRootWindowController* root_window_controller_;
+  RootWindowController* root_window_controller_;
   views::Widget* wallpaper_widget_;
 
   // Is this object observing the initial brightness/grayscale animation?
   const bool is_initial_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(ShowWallpaperAnimationObserver);
 };
 
 }  // namespace
 
@@ skipping 42 matching lines @@
 }
 
 void WallpaperWidgetController::OnWindowBoundsChanged(
     WmWindow* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   SetBounds(new_bounds);
 }
 
 void WallpaperWidgetController::StartAnimating(
-    WmRootWindowController* root_window_controller) {
+    RootWindowController* root_window_controller) {
   if (widget_) {
     ui::ScopedLayerAnimationSettings settings(
         widget_->GetLayer()->GetAnimator());
     settings.AddObserver(new ShowWallpaperAnimationObserver(
         root_window_controller, widget_,
         WmShell::Get()->wallpaper_delegate()->ShouldShowInitialAnimation()));
     // When |widget_| shows, AnimateShowWindowCommon() is called to do the
     // animation. Sets transition duration to 0 to avoid animating to the
     // show animation's initial values.
     settings.SetTransitionDuration(base::TimeDelta());
@@ skipping 13 matching lines @@
 }
 
 WallpaperWidgetController* AnimatingWallpaperWidgetController::GetController(
     bool pass_ownership) {
   if (pass_ownership)
     return controller_.release();
   return controller_.get();
 }
 
 }  // namespace ash