Removes most aura dependencies from WindowResizer

ash/wm/window_resizer.h

 // 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.
 
 #ifndef ASH_WM_WINDOW_RESIZER_H_
 #define ASH_WM_WINDOW_RESIZER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/wm/drag_details.h"
 #include "ash/wm/window_state.h"
 #include "base/macros.h"
-#include "ui/gfx/geometry/rect.h"
 #include "ui/wm/public/window_move_client.h"
 
 namespace aura {
 class Window;
 }
 
+namespace gfx {
+class Rect;
+}
+
 namespace ash {
+namespace wm {
+class WmWindow;
+}
 
 // WindowResizer is used by ToplevelWindowEventFilter to handle dragging, moving
 // or resizing a window. All coordinates passed to this are in the parent
 // windows coordinates.
 class ASH_EXPORT WindowResizer {
  public:
   // Constants to identify the type of resize.
   static const int kBoundsChange_None;
   static const int kBoundsChange_Repositions;
   static const int kBoundsChange_Resizes;
 
   // Used to indicate which direction the resize occurs in.
   static const int kBoundsChangeDirection_None;
   static const int kBoundsChangeDirection_Horizontal;
   static const int kBoundsChangeDirection_Vertical;
 
-  WindowResizer(wm::WindowState* window_state);
+  explicit WindowResizer(wm::WindowState* window_state);
   virtual ~WindowResizer();
 
   // Returns a bitmask of the kBoundsChange_ values.
   static int GetBoundsChangeForWindowComponent(int component);
 
   // Returns a bitmask of the kBoundsChange_ values.
   static int GetPositionChangeDirectionForWindowComponent(int window_component);
 
   // Invoked to drag/move/resize the window. |location| is in the coordinates
   // of the window supplied to the constructor. |event_flags| is the event
   // flags from the event.
   virtual void Drag(const gfx::Point& location, int event_flags) = 0;
 
   // Invoked to complete the drag.
   virtual void CompleteDrag() = 0;
 
   // Reverts the drag.
   virtual void RevertDrag() = 0;
 
   // Returns the target window the resizer was created for.
-  aura::Window* GetTarget() const {
-    return window_state_ ? window_state_->aura_window() : NULL;
+  wm::WmWindow* GetTarget() const {
+    return window_state_ ? window_state_->window() : nullptr;
+  }
+  // Deprecated.
+  // TODO(sky): remove.
+  aura::Window* GetAuraTarget() const {
+    return window_state_ ? window_state_->aura_window() : nullptr;
   }
 
   // See comment for |DragDetails::initial_location_in_parent|.
   const gfx::Point& GetInitialLocation() const {
     return window_state_->drag_details()->initial_location_in_parent;
   }
 
   // Drag parameters established when drag starts.
   const DragDetails& details() const { return *window_state_->drag_details(); }
 
@@ skipping 31 matching lines @@
 // TODO(sky): move this to its own file. This is aura specific.
 ASH_EXPORT std::unique_ptr<WindowResizer> CreateWindowResizer(
     aura::Window* window,
     const gfx::Point& point_in_parent,
     int window_component,
     aura::client::WindowMoveSource source);
 
 }  // namespace ash
 
 #endif  // ASH_WM_WINDOW_RESIZER_H_