OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_SCREEN_X11_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 | 11 |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
14 #include "ui/display/display_change_notifier.h" | 14 #include "ui/display/display_change_notifier.h" |
15 #include "ui/display/screen.h" | 15 #include "ui/display/screen.h" |
16 #include "ui/events/platform/platform_event_dispatcher.h" | 16 #include "ui/events/platform/platform_event_dispatcher.h" |
17 #include "ui/gfx/x/x11_atom_cache.h" | |
18 #include "ui/views/views_export.h" | 17 #include "ui/views/views_export.h" |
19 | 18 |
20 typedef unsigned long XID; | 19 typedef unsigned long XID; |
21 typedef XID Window; | 20 typedef XID Window; |
22 typedef struct _XDisplay Display; | 21 typedef struct _XDisplay Display; |
23 | 22 |
24 namespace views { | 23 namespace views { |
25 class DesktopScreenX11Test; | 24 class DesktopScreenX11Test; |
26 | 25 |
27 namespace test { | 26 namespace test { |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 | 89 |
91 // The index into displays_ that represents the primary display. | 90 // The index into displays_ that represents the primary display. |
92 size_t primary_display_index_; | 91 size_t primary_display_index_; |
93 | 92 |
94 // The timer to delay configuring outputs. See also the comments in | 93 // The timer to delay configuring outputs. See also the comments in |
95 // Dispatch(). | 94 // Dispatch(). |
96 std::unique_ptr<base::OneShotTimer> configure_timer_; | 95 std::unique_ptr<base::OneShotTimer> configure_timer_; |
97 | 96 |
98 display::DisplayChangeNotifier change_notifier_; | 97 display::DisplayChangeNotifier change_notifier_; |
99 | 98 |
100 ui::X11AtomCache atom_cache_; | |
101 | |
102 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 99 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); |
103 }; | 100 }; |
104 | 101 |
105 } // namespace views | 102 } // namespace views |
106 | 103 |
107 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 104 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
OLD | NEW |