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 CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 5 #ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
6 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 6 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
13 #include "base/event_types.h" | 13 #include "base/event_types.h" |
14 #include "base/observer_list.h" | |
15 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
16 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
17 #include "base/timer.h" | 16 #include "base/observer_list.h" |
| 17 #include "base/timer/timer.h" |
18 #include "chromeos/chromeos_export.h" | 18 #include "chromeos/chromeos_export.h" |
19 #include "third_party/cros_system_api/dbus/service_constants.h" | 19 #include "third_party/cros_system_api/dbus/service_constants.h" |
20 | 20 |
21 // Forward declarations for Xlib and Xrandr. | 21 // Forward declarations for Xlib and Xrandr. |
22 // This is so unused X definitions don't pollute the namespace. | 22 // This is so unused X definitions don't pollute the namespace. |
23 typedef unsigned long XID; | 23 typedef unsigned long XID; |
24 typedef XID RROutput; | 24 typedef XID RROutput; |
25 typedef XID RRCrtc; | 25 typedef XID RRCrtc; |
26 typedef XID RRMode; | 26 typedef XID RRMode; |
27 | 27 |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_; | 370 scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_; |
371 | 371 |
372 DISALLOW_COPY_AND_ASSIGN(OutputConfigurator); | 372 DISALLOW_COPY_AND_ASSIGN(OutputConfigurator); |
373 }; | 373 }; |
374 | 374 |
375 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList; | 375 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList; |
376 | 376 |
377 } // namespace chromeos | 377 } // namespace chromeos |
378 | 378 |
379 #endif // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ | 379 #endif // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
OLD | NEW |