Removes most aura dependencies from WindowResizer

ash/wm/toplevel_window_event_handler.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/wm/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/common/wm_event.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 105 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedWindowResizer);
 };
 
 ToplevelWindowEventHandler::ScopedWindowResizer::ScopedWindowResizer(
     ToplevelWindowEventHandler* handler,
     WindowResizer* resizer)
     : handler_(handler),
       resizer_(resizer),
       grabbed_capture_(false) {
-  aura::Window* target = resizer_->GetTarget();
+  aura::Window* target = resizer_->GetAuraTarget();
   target->AddObserver(this);
   wm::GetWindowState(target)->AddObserver(this);
 
   if (!target->HasCapture()) {
     grabbed_capture_ = true;
     target->SetCapture();
   }
 }
 
 ToplevelWindowEventHandler::ScopedWindowResizer::~ScopedWindowResizer() {
-  aura::Window* target = resizer_->GetTarget();
+  aura::Window* target = resizer_->GetAuraTarget();
   target->RemoveObserver(this);
   wm::GetWindowState(target)->RemoveObserver(this);
   if (grabbed_capture_)
     target->ReleaseCapture();
 }
 
 bool ToplevelWindowEventHandler::ScopedWindowResizer::IsMove() const {
   return resizer_->details().bounds_change ==
       WindowResizer::kBoundsChange_Repositions;
 }
 
 void
 ToplevelWindowEventHandler::ScopedWindowResizer::OnPreWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old) {
   handler_->CompleteDrag(DRAG_COMPLETE);
 }
 
 void ToplevelWindowEventHandler::ScopedWindowResizer::OnWindowDestroying(
     aura::Window* window) {
-  DCHECK_EQ(resizer_->GetTarget(), window);
+  DCHECK_EQ(resizer_->GetAuraTarget(), window);
   handler_->ResizerWindowDestroyed();
 }
 
 // ToplevelWindowEventHandler --------------------------------------------------
 
 ToplevelWindowEventHandler::ToplevelWindowEventHandler()
     : first_finger_hittest_(HTNOWHERE),
       in_move_loop_(false),
       in_gesture_drag_(false),
       drag_reverted_(false),
@@ skipping 58 matching lines @@
   if (event->handled())
     return;
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (!target->delegate())
     return;
 
   if (window_resizer_.get() && !in_gesture_drag_)
     return;
 
   if (window_resizer_.get() &&
-      window_resizer_->resizer()->GetTarget() != target) {
+      window_resizer_->resizer()->GetAuraTarget() != target) {
     return;
   }
 
   if (event->details().touch_points() > 2) {
     if (CompleteDrag(DRAG_COMPLETE))
       event->StopPropagation();
     return;
   }
 
   switch (event->type()) {
@@ skipping 222 matching lines @@
   std::unique_ptr<ScopedWindowResizer> resizer(window_resizer_.release());
   switch (status) {
     case DRAG_COMPLETE:
       resizer->resizer()->CompleteDrag();
       break;
     case DRAG_REVERT:
       resizer->resizer()->RevertDrag();
       break;
     case DRAG_RESIZER_WINDOW_DESTROYED:
       // We explicitly do not invoke RevertDrag() since that may do things to
-      // WindowResizer::GetTarget() which was destroyed.
+      // WindowResizer::GetAuraTarget() which was destroyed.
       break;
   }
   drag_reverted_ = (status != DRAG_COMPLETE);
 
   first_finger_hittest_ = HTNOWHERE;
   in_gesture_drag_ = false;
   if (in_move_loop_)
     quit_closure_.Run();
   return true;
 }
@@ skipping 138 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 void ToplevelWindowEventHandler::ResizerWindowDestroyed() {
   CompleteDrag(DRAG_RESIZER_WINDOW_DESTROYED);
 }
 
 }  // namespace ash