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 <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
9 // 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. |
10 #undef RootWindow | 11 #undef RootWindow |
11 | 12 |
12 #include <vector> | 13 #include <vector> |
13 | 14 |
| 15 #include "base/macros.h" |
14 #include "ui/aura/env_observer.h" | 16 #include "ui/aura/env_observer.h" |
15 #include "ui/events/platform/platform_event_dispatcher.h" | 17 #include "ui/events/platform/platform_event_dispatcher.h" |
16 #include "ui/gfx/x/x11_atom_cache.h" | 18 #include "ui/gfx/x/x11_atom_cache.h" |
17 #include "ui/gfx/x/x11_types.h" | 19 #include "ui/gfx/x/x11_types.h" |
18 #include "ui/views/views_export.h" | 20 #include "ui/views/views_export.h" |
19 | 21 |
20 namespace base { | 22 namespace base { |
21 template <typename T> struct DefaultSingletonTraits; | 23 template <typename T> struct DefaultSingletonTraits; |
22 } | 24 } |
23 | 25 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 ui::X11AtomCache atom_cache_; | 107 ui::X11AtomCache atom_cache_; |
106 | 108 |
107 bool wm_supports_active_window_; | 109 bool wm_supports_active_window_; |
108 | 110 |
109 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); | 111 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); |
110 }; | 112 }; |
111 | 113 |
112 } // namespace views | 114 } // namespace views |
113 | 115 |
114 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ | 116 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ |
OLD | NEW |