diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/ash/wm/workspace/workspace_window_resizer.h | |
parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/ash/wm/workspace/workspace_window_resizer.h')
-rw-r--r-- | chromium/ash/wm/workspace/workspace_window_resizer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chromium/ash/wm/workspace/workspace_window_resizer.h b/chromium/ash/wm/workspace/workspace_window_resizer.h index 76176b1a2b4..61f18969cbc 100644 --- a/chromium/ash/wm/workspace/workspace_window_resizer.h +++ b/chromium/ash/wm/workspace/workspace_window_resizer.h @@ -41,10 +41,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { // this close to an edge of the screen it snaps to the edge. static const int kScreenEdgeInset; - // Distance in pixels that the cursor must move past an edge for a window - // to move or resize beyond that edge. - static const int kStickyDistancePixels; - virtual ~WorkspaceWindowResizer(); static WorkspaceWindowResizer* Create( @@ -69,7 +65,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { private: FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, CancelSnapPhantom); FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomSnapMaxSize); - FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomWindowShow); // Type of snapping. enum SnapType { |