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

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

Issue 2914103002: Remove usages of XInternAtom (Closed)
Patch Set: Address sadrul and sergeyu comments Created 3 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <X11/extensions/shape.h> 10 #include <X11/extensions/shape.h>
11 #include <X11/Xlib.h> 11 #include <X11/Xlib.h>
12 #include <X11/Xutil.h> 12 #include <X11/Xutil.h>
13 13
14 #include "base/cancelable_callback.h" 14 #include "base/cancelable_callback.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "ui/aura/scoped_window_targeter.h" 18 #include "ui/aura/scoped_window_targeter.h"
19 #include "ui/aura/window_tree_host.h" 19 #include "ui/aura/window_tree_host.h"
20 #include "ui/base/cursor/cursor_loader_x11.h" 20 #include "ui/base/cursor/cursor_loader_x11.h"
21 #include "ui/events/platform/platform_event_dispatcher.h" 21 #include "ui/events/platform/platform_event_dispatcher.h"
22 #include "ui/gfx/geometry/insets.h" 22 #include "ui/gfx/geometry/insets.h"
23 #include "ui/gfx/geometry/rect.h" 23 #include "ui/gfx/geometry/rect.h"
24 #include "ui/gfx/geometry/size.h" 24 #include "ui/gfx/geometry/size.h"
25 #include "ui/gfx/x/x11_atom_cache.h"
26 #include "ui/views/views_export.h" 25 #include "ui/views/views_export.h"
27 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 26 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
28 27
29 namespace gfx { 28 namespace gfx {
30 class ImageSkia; 29 class ImageSkia;
31 class ImageSkiaRep; 30 class ImageSkiaRep;
32 } 31 }
33 32
34 namespace ui { 33 namespace ui {
35 class EventHandler; 34 class EventHandler;
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // The display and the native X window hosting the root window. 281 // The display and the native X window hosting the root window.
283 XDisplay* xdisplay_; 282 XDisplay* xdisplay_;
284 ::Window xwindow_; 283 ::Window xwindow_;
285 284
286 // Events selected on |xwindow_|. 285 // Events selected on |xwindow_|.
287 std::unique_ptr<ui::XScopedEventSelector> xwindow_events_; 286 std::unique_ptr<ui::XScopedEventSelector> xwindow_events_;
288 287
289 // The native root window. 288 // The native root window.
290 ::Window x_root_window_; 289 ::Window x_root_window_;
291 290
292 ui::X11AtomCache atom_cache_;
293
294 // Whether the window is mapped with respect to the X server. 291 // Whether the window is mapped with respect to the X server.
295 bool window_mapped_in_server_; 292 bool window_mapped_in_server_;
296 293
297 // Whether the window is visible with respect to Aura. 294 // Whether the window is visible with respect to Aura.
298 bool window_mapped_in_client_; 295 bool window_mapped_in_client_;
299 296
300 // The bounds of |xwindow_|. 297 // The bounds of |xwindow_|.
301 gfx::Rect bounds_in_pixels_; 298 gfx::Rect bounds_in_pixels_;
302 299
303 // Whenever the bounds are set, we keep the previous set of bounds around so 300 // Whenever the bounds are set, we keep the previous set of bounds around so
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 425
429 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 426 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
430 base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_; 427 base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_;
431 428
432 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 429 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
433 }; 430 };
434 431
435 } // namespace views 432 } // namespace views
436 433
437 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 434 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_screen_x11.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698