Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/workspace/multi_window_resize_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/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/common/wm/workspace/workspace_window_resizer.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 152 matching lines @@
   if (IsShowing() && windows_.Equals(windows))
     return;
 
   Hide();
   if (!windows.is_valid()) {
     windows_ = ResizeWindows();
     return;
   }
 
   windows_ = windows;
-  windows_.window1->AddObserver(this);
-  windows_.window2->AddObserver(this);
+  windows_.window1->aura_window()->AddObserver(this);
+  windows_.window2->aura_window()->AddObserver(this);
   show_location_in_parent_ =
       window->ConvertPointToTarget(window->GetParent(), point_in_window);
   show_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kShowDelayMS),
                     this,
                     &MultiWindowResizeController::ShowIfValidMouseLocation);
 }
 
 void MultiWindowResizeController::Hide() {
   if (window_resizer_)
     return;  // Ignore hides while actively resizing.
 
   if (windows_.window1) {
-    windows_.window1->RemoveObserver(this);
+    windows_.window1->aura_window()->RemoveObserver(this);
     windows_.window1 = NULL;
   }
   if (windows_.window2) {
-    windows_.window2->RemoveObserver(this);
+    windows_.window2->aura_window()->RemoveObserver(this);
     windows_.window2 = NULL;
   }
 
   show_timer_.Stop();
 
   if (!resize_widget_)
     return;
 
   for (size_t i = 0; i < windows_.other_windows.size(); ++i)
-    windows_.other_windows[i]->RemoveObserver(this);
+    windows_.other_windows[i]->aura_window()->RemoveObserver(this);
   mouse_watcher_.reset();
   resize_widget_.reset();
   windows_ = ResizeWindows();
 }
 
 void MultiWindowResizeController::MouseMovedOutOfHost() {
   Hide();
 }
 
-void MultiWindowResizeController::OnWindowDestroying(WmWindow* window) {
+void MultiWindowResizeController::OnWindowDestroying(aura::Window* window) {
   // Have to explicitly reset the WindowResizer, otherwise Hide() does nothing.
   window_resizer_.reset();
   Hide();
 }
 
 MultiWindowResizeController::ResizeWindows
 MultiWindowResizeController::DetermineWindowsFromScreenPoint(
     WmWindow* window) const {
   gfx::Point mouse_location(
       display::Screen::GetScreen()->GetCursorScreenPoint());
@@ skipping 182 matching lines @@
   DCHECK(!window_resizer_.get());
   DCHECK(windows_.is_valid());
   gfx::Point location_in_parent =
       windows_.window2->GetParent()->ConvertPointFromScreen(location_in_screen);
   std::vector<WmWindow*> windows;
   windows.push_back(windows_.window2);
   DCHECK(windows_.other_windows.empty());
   FindWindowsTouching(windows_.window2, windows_.direction,
                       &windows_.other_windows);
   for (size_t i = 0; i < windows_.other_windows.size(); ++i) {
-    windows_.other_windows[i]->AddObserver(this);
+    windows_.other_windows[i]->aura_window()->AddObserver(this);
     windows.push_back(windows_.other_windows[i]);
   }
   int component = windows_.direction == LEFT_RIGHT ? HTRIGHT : HTBOTTOM;
   wm::WindowState* window_state = windows_.window1->GetWindowState();
   window_state->CreateDragDetails(location_in_parent, component,
                                   aura::client::WINDOW_MOVE_SOURCE_MOUSE);
   window_resizer_.reset(WorkspaceWindowResizer::Create(window_state, windows));
 
   // Do not hide the resize widget while a drag is active.
   mouse_watcher_.reset();
@@ skipping 21 matching lines @@
 
   // Mouse may still be over resizer, if not hide.
   gfx::Point screen_loc = display::Screen::GetScreen()->GetCursorScreenPoint();
   if (!resize_widget_->GetWindowBoundsInScreen().Contains(screen_loc)) {
     Hide();
   } else {
     // If the mouse is over the resizer we need to remove observers on any of
     // the |other_windows|. If we start another resize we'll recalculate the
     // |other_windows| and invoke AddObserver() as necessary.
     for (size_t i = 0; i < windows_.other_windows.size(); ++i)
-      windows_.other_windows[i]->RemoveObserver(this);
+      windows_.other_windows[i]->aura_window()->RemoveObserver(this);
     windows_.other_windows.clear();
 
     CreateMouseWatcher();
   }
 }
 
 void MultiWindowResizeController::CancelResize() {
   if (!window_resizer_)
     return;  // Happens if window was destroyed and we nuked the WindowResizer.
   window_resizer_->RevertDrag();
@@ skipping 66 matching lines @@
 
 bool MultiWindowResizeController::IsOverComponent(
     WmWindow* window,
     const gfx::Point& location_in_screen,
     int component) const {
   gfx::Point window_loc = window->ConvertPointFromScreen(location_in_screen);
   return window->GetNonClientComponent(window_loc) == component;
 }
 
 }  // namespace ash