| 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/events/platform/platform_event_dispatcher.h" | 14 #include "ui/events/platform/platform_event_dispatcher.h" |
| 15 #include "ui/gfx/display_change_notifier.h" | 15 #include "ui/gfx/display_change_notifier.h" |
| 16 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
| 17 #include "ui/gfx/x/x11_atom_cache.h" |
| 17 #include "ui/views/views_export.h" | 18 #include "ui/views/views_export.h" |
| 18 | 19 |
| 19 namespace gfx { | 20 namespace gfx { |
| 20 class Display; | 21 class Display; |
| 21 } | 22 } |
| 22 | 23 |
| 23 typedef unsigned long XID; | 24 typedef unsigned long XID; |
| 24 typedef XID Window; | 25 typedef XID Window; |
| 25 typedef struct _XDisplay Display; | 26 typedef struct _XDisplay Display; |
| 26 | 27 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 88 |
| 88 // The display objects we present to chrome. | 89 // The display objects we present to chrome. |
| 89 std::vector<gfx::Display> displays_; | 90 std::vector<gfx::Display> displays_; |
| 90 | 91 |
| 91 // The timer to delay configuring outputs. See also the comments in | 92 // The timer to delay configuring outputs. See also the comments in |
| 92 // Dispatch(). | 93 // Dispatch(). |
| 93 std::unique_ptr<base::OneShotTimer> configure_timer_; | 94 std::unique_ptr<base::OneShotTimer> configure_timer_; |
| 94 | 95 |
| 95 gfx::DisplayChangeNotifier change_notifier_; | 96 gfx::DisplayChangeNotifier change_notifier_; |
| 96 | 97 |
| 98 ui::X11AtomCache atom_cache_; |
| 99 |
| 97 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 100 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); |
| 98 }; | 101 }; |
| 99 | 102 |
| 100 } // namespace views | 103 } // namespace views |
| 101 | 104 |
| 102 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 105 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
| OLD | NEW |