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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_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: Removed unwanted header inclusions 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_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/focus_change_observer.h" 9 #include "ui/aura/client/focus_change_observer.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 void RootWindowDestroyed(); 248 void RootWindowDestroyed();
249 249
250 scoped_ptr<aura::WindowTreeHost> host_; 250 scoped_ptr<aura::WindowTreeHost> host_;
251 DesktopWindowTreeHost* desktop_window_tree_host_; 251 DesktopWindowTreeHost* desktop_window_tree_host_;
252 252
253 // See class documentation for Widget in widget.h for a note about ownership. 253 // See class documentation for Widget in widget.h for a note about ownership.
254 Widget::InitParams::Ownership ownership_; 254 Widget::InitParams::Ownership ownership_;
255 255
256 scoped_ptr<DesktopCaptureClient> capture_client_; 256 scoped_ptr<DesktopCaptureClient> capture_client_;
257 257
258 // The following factory is used for calls to close the NativeWidgetAura
259 // instance.
260 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
261
262 // Child of the root, contains |content_window_|. 258 // Child of the root, contains |content_window_|.
263 aura::Window* content_window_container_; 259 aura::Window* content_window_container_;
264 260
265 // Child of |content_window_container_|. This is the return value from 261 // Child of |content_window_container_|. This is the return value from
266 // GetNativeView(). 262 // GetNativeView().
267 // WARNING: this may be NULL, in particular during shutdown it becomes NULL. 263 // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
268 aura::Window* content_window_; 264 aura::Window* content_window_;
269 265
270 internal::NativeWidgetDelegate* native_widget_delegate_; 266 internal::NativeWidgetDelegate* native_widget_delegate_;
271 267
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 304
309 scoped_ptr<wm::ShadowController> shadow_controller_; 305 scoped_ptr<wm::ShadowController> shadow_controller_;
310 306
311 // Reorders child windows of |window_| associated with a view based on the 307 // Reorders child windows of |window_| associated with a view based on the
312 // order of the associated views in the widget's view hierarchy. 308 // order of the associated views in the widget's view hierarchy.
313 scoped_ptr<WindowReorderer> window_reorderer_; 309 scoped_ptr<WindowReorderer> window_reorderer_;
314 310
315 // See class documentation for Widget in widget.h for a note about type. 311 // See class documentation for Widget in widget.h for a note about type.
316 Widget::InitParams::Type widget_type_; 312 Widget::InitParams::Type widget_type_;
317 313
314 // The following factory is used for calls to close the NativeWidgetAura
315 // instance.
316 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
317
318 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 318 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
319 }; 319 };
320 320
321 } // namespace views 321 } // namespace views
322 322
323 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 323 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/accessible_pane_view.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698