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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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
« no previous file with comments | « ui/views/focus/widget_focus_manager.h ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <X11/Xutil.h> 10 #include <X11/Xutil.h>
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 312
313 DesktopNativeWidgetAura* desktop_native_widget_aura_; 313 DesktopNativeWidgetAura* desktop_native_widget_aura_;
314 314
315 aura::Window* content_window_; 315 aura::Window* content_window_;
316 316
317 // We can optionally have a parent which can order us to close, or own 317 // We can optionally have a parent which can order us to close, or own
318 // children who we're responsible for closing when we CloseNow(). 318 // children who we're responsible for closing when we CloseNow().
319 DesktopWindowTreeHostX11* window_parent_; 319 DesktopWindowTreeHostX11* window_parent_;
320 std::set<DesktopWindowTreeHostX11*> window_children_; 320 std::set<DesktopWindowTreeHostX11*> window_children_;
321 321
322 ObserverList<DesktopWindowTreeHostObserverX11> observer_list_; 322 base::ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
323 323
324 // The window shape if the window is non-rectangular. 324 // The window shape if the window is non-rectangular.
325 gfx::XScopedPtr<_XRegion, gfx::XObjectDeleter<_XRegion, int, XDestroyRegion>> 325 gfx::XScopedPtr<_XRegion, gfx::XObjectDeleter<_XRegion, int, XDestroyRegion>>
326 window_shape_; 326 window_shape_;
327 327
328 // Whether |window_shape_| was set via SetShape(). 328 // Whether |window_shape_| was set via SetShape().
329 bool custom_window_shape_; 329 bool custom_window_shape_;
330 330
331 // The size of the window manager provided borders (if any). 331 // The size of the window manager provided borders (if any).
332 gfx::Insets native_window_frame_borders_in_pixels_; 332 gfx::Insets native_window_frame_borders_in_pixels_;
(...skipping 17 matching lines...) Expand all
350 base::CancelableCallback<void()> delayed_resize_task_; 350 base::CancelableCallback<void()> delayed_resize_task_;
351 351
352 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 352 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
353 353
354 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 354 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
355 }; 355 };
356 356
357 } // namespace views 357 } // namespace views
358 358
359 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 359 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW
« no previous file with comments | « ui/views/focus/widget_focus_manager.h ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698