OLD | NEW |
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_X11_DESKTOP_HANDLER_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. | 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. |
11 #undef RootWindow | 11 #undef RootWindow |
12 | 12 |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
17 #include "ui/aura/env_observer.h" | 17 #include "ui/aura/env_observer.h" |
18 #include "ui/events/platform/platform_event_dispatcher.h" | 18 #include "ui/events/platform/platform_event_dispatcher.h" |
19 #include "ui/events/platform/x11/x11_event_source.h" | 19 #include "ui/events/platform/x11/x11_event_source.h" |
20 #include "ui/gfx/x/x11_atom_cache.h" | |
21 #include "ui/gfx/x/x11_types.h" | 20 #include "ui/gfx/x/x11_types.h" |
22 #include "ui/views/views_export.h" | 21 #include "ui/views/views_export.h" |
23 #include "ui/views/widget/desktop_aura/x11_desktop_handler_observer.h" | 22 #include "ui/views/widget/desktop_aura/x11_desktop_handler_observer.h" |
24 | 23 |
25 namespace base { | 24 namespace base { |
26 template <typename T> struct DefaultSingletonTraits; | 25 template <typename T> struct DefaultSingletonTraits; |
27 } | 26 } |
28 | 27 |
29 namespace ui { | 28 namespace ui { |
30 class XScopedEventSelector; | 29 class XScopedEventSelector; |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 73 |
75 // The display and the native X window hosting the root window. | 74 // The display and the native X window hosting the root window. |
76 XDisplay* xdisplay_; | 75 XDisplay* xdisplay_; |
77 | 76 |
78 // The native root window. | 77 // The native root window. |
79 ::Window x_root_window_; | 78 ::Window x_root_window_; |
80 | 79 |
81 // Events selected on x_root_window_. | 80 // Events selected on x_root_window_. |
82 std::unique_ptr<ui::XScopedEventSelector> x_root_window_events_; | 81 std::unique_ptr<ui::XScopedEventSelector> x_root_window_events_; |
83 | 82 |
84 ui::X11AtomCache atom_cache_; | |
85 | |
86 base::ObserverList<X11DesktopHandlerObserver> observers_; | 83 base::ObserverList<X11DesktopHandlerObserver> observers_; |
87 | 84 |
88 std::string workspace_; | 85 std::string workspace_; |
89 | 86 |
90 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); | 87 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); |
91 }; | 88 }; |
92 | 89 |
93 } // namespace views | 90 } // namespace views |
94 | 91 |
95 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 92 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
OLD | NEW |