| Index: ash/wm/workspace/workspace_window_resizer.h
|
| diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
|
| index 3b28e1e23642c1bd5fcc64d2199e84e917eeb136..1a6f4b301a2de711f8d0e0e519e689fd6f928005 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.h
|
| +++ b/ash/wm/workspace/workspace_window_resizer.h
|
| @@ -49,7 +49,8 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| }
|
|
|
| // Overridden from WindowResizer:
|
| - virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE;
|
| + virtual void Drag(const gfx::Point& location_in_screen,
|
| + int event_flags) OVERRIDE;
|
| virtual void CompleteDrag(int event_flags) OVERRIDE;
|
| virtual void RevertDrag() OVERRIDE;
|
|
|
| @@ -119,6 +120,9 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| // snapping should be used.
|
| SnapType GetSnapType(const gfx::Point& location) const;
|
|
|
| + // Returns true if we should allow the cursor to warp.
|
| + bool ShouldAllowCursorWarp() const;
|
| +
|
| aura::Window* window() const { return details_.window; }
|
|
|
| const Details details_;
|
|
|