Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / wm / workspace / workspace_window_resizer.h

diff --git a/src/ash/wm/workspace/workspace_window_resizer.h b/src/ash/wm/workspace/workspace_window_resizer.h
index 99a2df5..ec73f4a 100644 (file)
--- a/src/ash/wm/workspace/workspace_window_resizer.h
+++ b/src/ash/wm/workspace/workspace_window_resizer.h
@@ -167,6 +167,9 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
 
   const std::vector<aura::Window*> attached_windows_;
 
+  // Returns the currently used instance for test.
+  static WorkspaceWindowResizer* GetInstanceForTest();
+
   bool did_lock_cursor_;
 
   // Set to true once Drag() is invoked and the bounds of the window change.
@@ -221,9 +224,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
   // gets dragged into another browser window.
   base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_;
 
-  // Current instance for use by the WorkspaceWindowResizerTest.
-  static WorkspaceWindowResizer* instance_;
-
   DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
 };