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

Side by Side Diff: ui/views/widget/native_widget_aura.h

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 internal::NativeWidgetDelegate* delegate_; 202 internal::NativeWidgetDelegate* delegate_;
203 203
204 // WARNING: set to NULL when destroyed. As the Widget is not necessarily 204 // WARNING: set to NULL when destroyed. As the Widget is not necessarily
205 // destroyed along with |window_| all usage of |window_| should first verify 205 // destroyed along with |window_| all usage of |window_| should first verify
206 // non-NULL. 206 // non-NULL.
207 aura::Window* window_; 207 aura::Window* window_;
208 208
209 // See class documentation for Widget in widget.h for a note about ownership. 209 // See class documentation for Widget in widget.h for a note about ownership.
210 Widget::InitParams::Ownership ownership_; 210 Widget::InitParams::Ownership ownership_;
211 211
212 // The following factory is used for calls to close the NativeWidgetAura
213 // instance.
214 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
215
216 // Are we in the destructor? 212 // Are we in the destructor?
217 bool destroying_; 213 bool destroying_;
218 214
219 gfx::NativeCursor cursor_; 215 gfx::NativeCursor cursor_;
220 216
221 // The saved window state for exiting full screen state. 217 // The saved window state for exiting full screen state.
222 ui::WindowShowState saved_window_state_; 218 ui::WindowShowState saved_window_state_;
223 219
224 scoped_ptr<TooltipManagerAura> tooltip_manager_; 220 scoped_ptr<TooltipManagerAura> tooltip_manager_;
225 221
226 // Reorders child windows of |window_| associated with a view based on the 222 // Reorders child windows of |window_| associated with a view based on the
227 // order of the associated views in the widget's view hierarchy. 223 // order of the associated views in the widget's view hierarchy.
228 scoped_ptr<WindowReorderer> window_reorderer_; 224 scoped_ptr<WindowReorderer> window_reorderer_;
229 225
230 scoped_ptr<DropHelper> drop_helper_; 226 scoped_ptr<DropHelper> drop_helper_;
231 int last_drop_operation_; 227 int last_drop_operation_;
232 228
229 // The following factory is used for calls to close the NativeWidgetAura
230 // instance.
231 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
232
233 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 233 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
234 }; 234 };
235 235
236 } // namespace views 236 } // namespace views
237 237
238 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 238 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698