OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ | 5 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ |
6 #define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ | 6 #define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ui/display/display_constants.h" | |
11 #include "ui/display/display_export.h" | 10 #include "ui/display/display_export.h" |
| 11 #include "ui/display/types/display_constants.h" |
12 | 12 |
13 typedef unsigned long XID; | 13 typedef unsigned long XID; |
14 typedef XID RROutput; | 14 typedef XID RROutput; |
15 | 15 |
16 namespace ui { | 16 namespace ui { |
17 | 17 |
18 // Returns the DisplayConnectionType by matching known type prefixes to |name|. | 18 // Returns the DisplayConnectionType by matching known type prefixes to |name|. |
19 // Returns DISPLAY_TYPE_UNKNOWN if no valid match. | 19 // Returns DISPLAY_TYPE_UNKNOWN if no valid match. |
20 DISPLAY_EXPORT DisplayConnectionType | 20 DISPLAY_EXPORT DisplayConnectionType |
21 GetDisplayConnectionTypeFromName(const std::string& name); | 21 GetDisplayConnectionTypeFromName(const std::string& name); |
22 | 22 |
23 } // namespace ui | 23 } // namespace ui |
24 | 24 |
25 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ | 25 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_ |
OLD | NEW |