[mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper)

ash/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/wallpaper/wallpaper_widget_controller.h"
 
 #include "ash/ash_export.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wallpaper/wallpaper_delegate.h"
-#include "ash/wm_window.h"
+#include "ui/aura/window.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:
@@ skipping 33 matching lines @@
 
   // Is this object observing the initial brightness/grayscale animation?
   const bool is_initial_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(ShowWallpaperAnimationObserver);
 };
 
 }  // namespace
 
 WallpaperWidgetController::WallpaperWidgetController(views::Widget* widget)
-    : widget_(widget),
-      widget_parent_(WmWindow::Get(widget->GetNativeWindow())->GetParent()) {
+    : widget_(widget), widget_parent_(widget->GetNativeWindow()->parent()) {
   DCHECK(widget_);
   widget_->AddObserver(this);
-  widget_parent_->aura_window()->AddObserver(this);
+  widget_parent_->AddObserver(this);
 }
 
 WallpaperWidgetController::~WallpaperWidgetController() {
   if (widget_) {
     views::Widget* widget = widget_;
     RemoveObservers();
     widget->CloseNow();
   }
 }
 
 void WallpaperWidgetController::OnWidgetDestroying(views::Widget* widget) {
   RemoveObservers();
 }
 
 void WallpaperWidgetController::SetBounds(const gfx::Rect& bounds) {
   if (widget_)
     widget_->SetBounds(bounds);
 }
 
-bool WallpaperWidgetController::Reparent(WmWindow* root_window, int container) {
+bool WallpaperWidgetController::Reparent(aura::Window* root_window,
+                                         int container) {
   if (widget_) {
-    widget_parent_->aura_window()->RemoveObserver(this);
-    WmWindow* window = WmWindow::Get(widget_->GetNativeWindow());
-    root_window->GetChildByShellWindowId(container)->AddChild(window);
-    widget_parent_ = WmWindow::Get(widget_->GetNativeWindow())->GetParent();
-    widget_parent_->aura_window()->AddObserver(this);
+    widget_parent_->RemoveObserver(this);
+    aura::Window* window = widget_->GetNativeWindow();
+    root_window->GetChildById(container)->AddChild(window);
+    widget_parent_ = widget_->GetNativeWindow()->parent();
+    widget_parent_->AddObserver(this);
     return true;
   }
   // Nothing to reparent.
   return false;
 }
 
 void WallpaperWidgetController::RemoveObservers() {
-  widget_parent_->aura_window()->RemoveObserver(this);
+  widget_parent_->RemoveObserver(this);
   widget_->RemoveObserver(this);
   widget_ = nullptr;
 }
 
 void WallpaperWidgetController::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   SetBounds(new_bounds);
 }
@@ skipping 26 matching lines @@
 }
 
 WallpaperWidgetController* AnimatingWallpaperWidgetController::GetController(
     bool pass_ownership) {
   if (pass_ownership)
     return controller_.release();
   return controller_.get();
 }
 
 }  // namespace ash