Chromium Code Reviews| Index: ash/wm/drag_window_resizer.h |
| diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h |
| index 817588274a18fedeb400d9374201cfcb37350359..d02f8e307c548184cb501bcda8073a935ba58a5f 100644 |
| --- a/ash/wm/drag_window_resizer.h |
| +++ b/ash/wm/drag_window_resizer.h |
| @@ -29,15 +29,15 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer { |
| const gfx::Point& location, |
| int window_component); |
| - // WindowResizer overides: |
| + // WindowResizer: |
| virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE; |
| virtual void CompleteDrag(int event_flags) OVERRIDE; |
| virtual void RevertDrag() OVERRIDE; |
| virtual aura::Window* GetTarget() OVERRIDE; |
| - const gfx::Point& GetInitialLocationInParentForTest() const { |
| - return details_.initial_location_in_parent; |
| - } |
| + protected: |
| + // WindowResizer: |
| + virtual const gfx::Point& GetInitialLocationForTest() const OVERRIDE; |
| private: |
| FRIEND_TEST_ALL_PREFIXES(DragWindowResizerTest, DragWindowController); |
| @@ -55,6 +55,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer { |
| // Returns true if we should allow the mouse pointer to warp. |
| bool ShouldAllowMouseWarp(); |
| + // Returns last created instance or NULL. |
| + static DragWindowResizer* instance() { return last_instance; } |
| + |
| scoped_ptr<WindowResizer> next_window_resizer_; |
| // Shows a semi-transparent image of the window being dragged. |
| @@ -68,6 +71,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer { |
| // been deleted. |
| bool* destroyed_; |
| + // Last instance created - for use by the DragWindowResizerTest. |
| + static DragWindowResizer* last_instance; |
|
sky
2013/06/17 19:49:47
Why the last here? Isn't this the current instance
flackr
2013/06/17 20:02:40
Ah, my mistake, I had just recommended this to avo
varkha
2013/06/17 20:34:57
Done.
varkha
2013/06/17 20:34:57
Done.
|
| + |
| DISALLOW_COPY_AND_ASSIGN(DragWindowResizer); |
| }; |