| Index: ash/wm/drag_window_resizer.h
|
| diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h
|
| index 52b8883063c2d708e68809f90a06aacbd6f1873b..09e9ca66ac49927e155eff3c1321f041601068eb 100644
|
| --- a/ash/wm/drag_window_resizer.h
|
| +++ b/ash/wm/drag_window_resizer.h
|
| @@ -30,15 +30,12 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
|
| int window_component,
|
| aura::client::WindowMoveSource source);
|
|
|
| - // 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;
|
| - }
|
| + virtual const gfx::Point& GetInitialLocation() const OVERRIDE;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(DragWindowResizerTest, DragWindowController);
|
| @@ -69,6 +66,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
|
| // been deleted.
|
| bool* destroyed_;
|
|
|
| + // Current instance for use by the DragWindowResizerTest.
|
| + static DragWindowResizer* instance_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DragWindowResizer);
|
| };
|
|
|
|
|