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

Side by Side 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: Created 6 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 5 #ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
6 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 6 #define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/wm/window_resizer.h" 10 #include "ash/wm/window_resizer.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // Used to verify |magnetism_window_| is still valid. 210 // Used to verify |magnetism_window_| is still valid.
211 aura::WindowTracker window_tracker_; 211 aura::WindowTracker window_tracker_;
212 212
213 // If |magnetism_window_| is non-NULL this indicates how the two windows 213 // If |magnetism_window_| is non-NULL this indicates how the two windows
214 // should attach. 214 // should attach.
215 MatchedEdge magnetism_edge_; 215 MatchedEdge magnetism_edge_;
216 216
217 // Dock container window layout manager. 217 // Dock container window layout manager.
218 DockedWindowLayoutManager* dock_layout_; 218 DockedWindowLayoutManager* dock_layout_;
219 219
220 // Current instance for use by the WorkspaceWindowResizerTest.
221 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.
222
220 // Used to determine if this has been deleted during a drag such as when a tab 223 // Used to determine if this has been deleted during a drag such as when a tab
221 // gets dragged into another browser window. 224 // gets dragged into another browser window.
222 base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_; 225 base::WeakPtrFactory<WorkspaceWindowResizer> weak_ptr_factory_;
223 226
224 // Current instance for use by the WorkspaceWindowResizerTest.
225 static WorkspaceWindowResizer* instance_;
226
227 DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer); 227 DISALLOW_COPY_AND_ASSIGN(WorkspaceWindowResizer);
228 }; 228 };
229 229
230 } // namespace ash 230 } // namespace ash
231 231
232 #endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_ 232 #endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
OLDNEW
« ash/shell.h ('K') | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698