| 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 ASH_DISPLAY_DISPLAY_INFO_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_INFO_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_INFO_H_ | 6 #define ASH_DISPLAY_DISPLAY_INFO_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
| 12 #include "ui/display/display_constants.h" | 12 #include "ui/display/types/display_constants.h" |
| 13 #include "ui/gfx/display.h" | 13 #include "ui/gfx/display.h" |
| 14 #include "ui/gfx/insets.h" | 14 #include "ui/gfx/insets.h" |
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 | 18 |
| 19 // A struct that represents the display's mode info. | 19 // A struct that represents the display's mode info. |
| 20 struct ASH_EXPORT DisplayMode { | 20 struct ASH_EXPORT DisplayMode { |
| 21 DisplayMode(); | 21 DisplayMode(); |
| 22 DisplayMode(const gfx::Size& size, | 22 DisplayMode(const gfx::Size& size, |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 // The current profile of the color calibration. | 231 // The current profile of the color calibration. |
| 232 ui::ColorCalibrationProfile color_profile_; | 232 ui::ColorCalibrationProfile color_profile_; |
| 233 | 233 |
| 234 // The list of available variations for the color calibration. | 234 // The list of available variations for the color calibration. |
| 235 std::vector<ui::ColorCalibrationProfile> available_color_profiles_; | 235 std::vector<ui::ColorCalibrationProfile> available_color_profiles_; |
| 236 }; | 236 }; |
| 237 | 237 |
| 238 } // namespace ash | 238 } // namespace ash |
| 239 | 239 |
| 240 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ | 240 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ |
| OLD | NEW |