Index: ash/wm/drag_window_resizer.h |
=================================================================== |
--- ash/wm/drag_window_resizer.h (revision 173169) |
+++ ash/wm/drag_window_resizer.h (working copy) |
@@ -5,31 +5,32 @@ |
#ifndef ASH_WM_DRAG_WINDOW_RESIZER_H_ |
#define ASH_WM_DRAG_WINDOW_RESIZER_H_ |
-#include "ash/wm/window_resizer.h" |
+#include "ash/ash_export.h" |
#include "base/compiler_specific.h" |
#include "base/gtest_prod_util.h" |
#include "ui/gfx/point.h" |
+#include "ui/views/corewm/window_resizer.h" |
namespace ash { |
namespace internal { |
class DragWindowController; |
-// DragWindowResizer is a decorator of WindowResizer and adds the ability to |
-// drag windows across displays. |
-class ASH_EXPORT DragWindowResizer : public WindowResizer { |
+// DragWindowResizer is a decorator of views::corewm::WindowResizer and adds |
+// the ability to drag windows across displays. |
+class ASH_EXPORT DragWindowResizer : public views::corewm::WindowResizer { |
public: |
virtual ~DragWindowResizer(); |
// Creates a new DragWindowResizer. The caller takes ownership of the |
// returned object. The ownership of |window_resizer| is taken by the |
// returned object. Returns NULL if not resizable. |
- static DragWindowResizer* Create(WindowResizer* window_resizer, |
+ static DragWindowResizer* Create(views::corewm::WindowResizer* window_resizer, |
aura::Window* window, |
const gfx::Point& location, |
int window_component); |
- // WindowResizer overides: |
+ // views::corewm::WindowResizer overides: |
virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; |
virtual void CompleteDrag(int event_flags) OVERRIDE; |
virtual void RevertDrag() OVERRIDE; |
@@ -55,7 +56,7 @@ |
// Returns true if we should allow the mouse pointer to warp. |
bool ShouldAllowMouseWarp(); |
- scoped_ptr<WindowResizer> window_resizer_; |
+ scoped_ptr<views::corewm::WindowResizer> window_resizer_; |
// Shows a semi-transparent image of the window being dragged. |
scoped_ptr<DragWindowController> drag_window_controller_; |