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

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: Removing Name Conflict 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 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 bool AreBoundsValidSnappedBounds(wm::WindowStateType snapped_type, 160 bool AreBoundsValidSnappedBounds(wm::WindowStateType snapped_type,
161 const gfx::Rect& bounds_in_parent) const; 161 const gfx::Rect& bounds_in_parent) const;
162 162
163 // Docks or undocks the dragged window. 163 // Docks or undocks the dragged window.
164 void SetDraggedWindowDocked(bool should_dock); 164 void SetDraggedWindowDocked(bool should_dock);
165 165
166 wm::WindowState* window_state() { return window_state_; } 166 wm::WindowState* window_state() { return window_state_; }
167 167
168 const std::vector<aura::Window*> attached_windows_; 168 const std::vector<aura::Window*> attached_windows_;
169 169
170 // Adding method to return WorkspaceWindowResizer *instance
oshima 2014/09/04 06:18:48 // Returns the currently used instance for test.
Anand Ratn (left samsung) 2014/09/04 07:31:12 Done.
171 static WorkspaceWindowResizer* g_instance();
oshima 2014/09/04 06:18:48 Sorry I meant "g_instance "as variable name. (It's
Anand Ratn (left samsung) 2014/09/04 07:31:12 Thank you oshima for clearing my doubt . I have ma
172
170 bool did_lock_cursor_; 173 bool did_lock_cursor_;
171 174
172 // Set to true once Drag() is invoked and the bounds of the window change. 175 // Set to true once Drag() is invoked and the bounds of the window change.
173 bool did_move_or_resize_; 176 bool did_move_or_resize_;
174 177
175 // True if the window initially had |bounds_changed_by_user_| set in state. 178 // True if the window initially had |bounds_changed_by_user_| set in state.
176 bool initial_bounds_changed_by_user_; 179 bool initial_bounds_changed_by_user_;
177 180
178 // The initial size of each of the windows in |attached_windows_| along the 181 // The initial size of each of the windows in |attached_windows_| along the
179 // primary axis. 182 // primary axis.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // should attach. 217 // should attach.
215 MatchedEdge magnetism_edge_; 218 MatchedEdge magnetism_edge_;
216 219
217 // Dock container window layout manager. 220 // Dock container window layout manager.
218 DockedWindowLayoutManager* dock_layout_; 221 DockedWindowLayoutManager* dock_layout_;
219 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
« 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