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> |
| 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
13 #include "ui/events/platform/platform_event_dispatcher.h" | 14 #include "ui/events/platform/platform_event_dispatcher.h" |
14 #include "ui/gfx/display_change_notifier.h" | 15 #include "ui/gfx/display_change_notifier.h" |
15 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
16 #include "ui/views/views_export.h" | 17 #include "ui/views/views_export.h" |
17 | 18 |
18 namespace gfx { | 19 namespace gfx { |
19 class Display; | 20 class Display; |
20 } | 21 } |
21 | 22 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 | 83 |
83 // The base of the event numbers used to represent XRandr events used in | 84 // The base of the event numbers used to represent XRandr events used in |
84 // decoding events regarding output add/remove. | 85 // decoding events regarding output add/remove. |
85 int xrandr_event_base_; | 86 int xrandr_event_base_; |
86 | 87 |
87 // The display objects we present to chrome. | 88 // The display objects we present to chrome. |
88 std::vector<gfx::Display> displays_; | 89 std::vector<gfx::Display> displays_; |
89 | 90 |
90 // The timer to delay configuring outputs. See also the comments in | 91 // The timer to delay configuring outputs. See also the comments in |
91 // Dispatch(). | 92 // Dispatch(). |
92 scoped_ptr<base::OneShotTimer> configure_timer_; | 93 std::unique_ptr<base::OneShotTimer> configure_timer_; |
93 | 94 |
94 gfx::DisplayChangeNotifier change_notifier_; | 95 gfx::DisplayChangeNotifier change_notifier_; |
95 | 96 |
96 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 97 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); |
97 }; | 98 }; |
98 | 99 |
99 } // namespace views | 100 } // namespace views |
100 | 101 |
101 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 102 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
OLD | NEW |