Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3315)

Unified Diff: ash/wm/workspace/workspace_window_resizer.h

Issue 497733002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Maintaining function in proper order Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ec73f4aa7279866f60af3549cbb91d00cc00b5fd 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/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);
};
« no previous file with comments | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698