Chromium Code Reviews| 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..5a277ef7264ebd9e8babc2532760bfa52524de6a 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. |
| +static WorkspaceWindowResizer* instance_ = NULL; |
|
oshima
2014/08/28 06:33:17
nit: remove static.
Anand Ratn (left samsung)
2014/08/28 07:17:39
Done.
|
| + |
| // 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 { |