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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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, 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include <X11/extensions/shape.h> 8 #include <X11/extensions/shape.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 10
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 // Relayout the widget's client and non-client views. 233 // Relayout the widget's client and non-client views.
234 void Relayout(); 234 void Relayout();
235 235
236 // ui::PlatformEventDispatcher: 236 // ui::PlatformEventDispatcher:
237 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 237 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
238 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 238 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
239 239
240 void DelayedResize(const gfx::Size& size); 240 void DelayedResize(const gfx::Size& size);
241 241
242 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
243
244 // X11 things 242 // X11 things
245 // The display and the native X window hosting the root window. 243 // The display and the native X window hosting the root window.
246 XDisplay* xdisplay_; 244 XDisplay* xdisplay_;
247 ::Window xwindow_; 245 ::Window xwindow_;
248 246
249 // The native root window. 247 // The native root window.
250 ::Window x_root_window_; 248 ::Window x_root_window_;
251 249
252 ui::X11AtomCache atom_cache_; 250 ui::X11AtomCache atom_cache_;
253 251
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 base::string16 window_title_; 330 base::string16 window_title_;
333 331
334 // Whether we currently are flashing our frame. This feature is implemented 332 // Whether we currently are flashing our frame. This feature is implemented
335 // by setting the urgency hint with the window manager, which can draw 333 // by setting the urgency hint with the window manager, which can draw
336 // attention to the window or completely ignore the hint. We stop flashing 334 // attention to the window or completely ignore the hint. We stop flashing
337 // the frame when |xwindow_| gains focus or handles a mouse button event. 335 // the frame when |xwindow_| gains focus or handles a mouse button event.
338 bool urgency_hint_set_; 336 bool urgency_hint_set_;
339 337
340 base::CancelableCallback<void()> delayed_resize_task_; 338 base::CancelableCallback<void()> delayed_resize_task_;
341 339
340 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
341
342 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 342 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
343 }; 343 };
344 344
345 } // namespace views 345 } // namespace views
346 346
347 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 347 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698