| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 ASH_DISPLAY_DISPLAY_UTIL_X11_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_UTIL_X11_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_UTIL_X11_H_ | 6 #define ASH_DISPLAY_DISPLAY_UTIL_X11_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/display/display_info.h" | 11 #include "ash/display/display_info.h" |
| 12 | 12 #include "chromeos/display/output_configurator.h" |
| 13 struct _XRRScreenResources; | |
| 14 typedef _XRRScreenResources XRRScreenResources; | |
| 15 struct _XRROutputInfo; | |
| 16 typedef _XRROutputInfo XRROutputInfo; | |
| 17 | 13 |
| 18 namespace ash { | 14 namespace ash { |
| 19 namespace internal { | 15 namespace internal { |
| 20 struct Resolution; | 16 struct Resolution; |
| 21 | 17 |
| 22 // Returns true if the size info in the output_info isn't valid | 18 // Returns true if the size info in the output_info isn't valid |
| 23 // and should be ignored. This is exposed for testing. | 19 // and should be ignored. This is exposed for testing. |
| 24 // |mm_width| and |mm_height| are given in millimeters. | 20 // |mm_width| and |mm_height| are given in millimeters. |
| 25 ASH_EXPORT bool ShouldIgnoreSize(unsigned long mm_width, | 21 ASH_EXPORT bool ShouldIgnoreSize(unsigned long mm_width, |
| 26 unsigned long mm_height); | 22 unsigned long mm_height); |
| 27 | 23 |
| 28 // Returns the resolution list. | 24 // Returns the resolution list. |
| 29 ASH_EXPORT std::vector<Resolution> GetResolutionList( | 25 ASH_EXPORT std::vector<Resolution> GetResolutionList( |
| 30 XRRScreenResources* screen_resources, | 26 const chromeos::OutputConfigurator::OutputSnapshot& output); |
| 31 XRROutputInfo* output_info); | |
| 32 | 27 |
| 33 } // namespace internal | 28 } // namespace internal |
| 34 } // namespace ash | 29 } // namespace ash |
| 35 | 30 |
| 36 #endif // ASH_DISPLAY_DISPLAY_UTIL_X11_H_ | 31 #endif // ASH_DISPLAY_DISPLAY_UTIL_X11_H_ |
| OLD | NEW |