Replace WmWindowObserver with aura::WindowObserver.

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_shell.h"
@@ skipping 49 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ShowWallpaperAnimationObserver);
 };
 
 }  // namespace
 
 WallpaperWidgetController::WallpaperWidgetController(views::Widget* widget)
     : widget_(widget),
       widget_parent_(WmLookup::Get()->GetWindowForWidget(widget)->GetParent()) {
   DCHECK(widget_);
   widget_->AddObserver(this);
-  widget_parent_->AddObserver(this);
+  widget_parent_->aura_window()->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) {
   if (widget_) {
-    widget_parent_->RemoveObserver(this);
+    widget_parent_->aura_window()->RemoveObserver(this);
     WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget_);
     root_window->GetChildByShellWindowId(container)->AddChild(window);
     widget_parent_ = WmLookup::Get()->GetWindowForWidget(widget_)->GetParent();
-    widget_parent_->AddObserver(this);
+    widget_parent_->aura_window()->AddObserver(this);
     return true;
   }
   // Nothing to reparent.
   return false;
 }
 
 void WallpaperWidgetController::RemoveObservers() {
-  widget_parent_->RemoveObserver(this);
+  widget_parent_->aura_window()->RemoveObserver(this);
   widget_->RemoveObserver(this);
   widget_ = nullptr;
 }
 
 void WallpaperWidgetController::OnWindowBoundsChanged(
-    WmWindow* window,
+    aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   SetBounds(new_bounds);
 }
 
 void WallpaperWidgetController::StartAnimating(
     RootWindowController* root_window_controller) {
   if (widget_) {
     ui::ScopedLayerAnimationSettings settings(
         widget_->GetLayer()->GetAnimator());
@@ skipping 20 matching lines @@
 }
 
 WallpaperWidgetController* AnimatingWallpaperWidgetController::GetController(
     bool pass_ownership) {
   if (pass_ownership)
     return controller_.release();
   return controller_.get();
 }
 
 }  // namespace ash