| Index: ash/wm/workspace/workspace_window_resizer.cc
|
| diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
|
| index 395c2adbdc80f2f0e4ecd5dfad0bdf0f66077044..fcb667aa5c1dbb6814defa383e92e536bf375802 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.cc
|
| +++ b/ash/wm/workspace/workspace_window_resizer.cc
|
| @@ -110,6 +110,9 @@ namespace {
|
| // when resizing a window using touchscreen.
|
| const int kScreenEdgeInsetForTouchDrag = 32;
|
|
|
| +// Current instance for use by the WorkspaceWindowResizerTest.
|
| +WorkspaceWindowResizer* instance_ = NULL;
|
| +
|
| // Returns true if the window should stick to the edge.
|
| bool ShouldStickToEdge(int distance_from_edge, int sticky_size) {
|
| return distance_from_edge < sticky_size &&
|
| @@ -256,9 +259,6 @@ const int WorkspaceWindowResizer::kMinOnscreenHeight = 32;
|
| // static
|
| const int WorkspaceWindowResizer::kScreenEdgeInset = 8;
|
|
|
| -// static
|
| -WorkspaceWindowResizer* WorkspaceWindowResizer::instance_ = NULL;
|
| -
|
| // Represents the width or height of a window with constraints on its minimum
|
| // and maximum size. 0 represents a lack of a constraint.
|
| class WindowSize {
|
|
|