Chromium Code Reviews| 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 99a2df51cd967c4608d92ad73613829f3b7c3e27..0bf4a2252c4b15d4e7d18e698f6a1d78caa7a85d 100644 |
| --- a/ash/wm/workspace/workspace_window_resizer.h |
| +++ b/ash/wm/workspace/workspace_window_resizer.h |
| @@ -217,13 +217,13 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
| // Dock container window layout manager. |
| DockedWindowLayoutManager* dock_layout_; |
| + // Current instance for use by the WorkspaceWindowResizerTest. |
| + static WorkspaceWindowResizer* instance_; |
|
oshima
2014/08/26 15:31:05
can you move this to anonymous namespace in .cc ?
Anand Ratn (left samsung)
2014/08/28 06:15:07
Done.
|
| + |
| // Used to determine if this has been deleted during a drag such as when a tab |
| // 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); |
| }; |