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 UI_BASE_LAYOUT_H_ | 5 #ifndef UI_BASE_LAYOUT_H_ |
6 #define UI_BASE_LAYOUT_H_ | 6 #define UI_BASE_LAYOUT_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 UI_EXPORT DisplayLayout GetDisplayLayout(); | 29 UI_EXPORT DisplayLayout GetDisplayLayout(); |
30 | 30 |
31 // Supported UI scale factors for the platform. This is used as an index | 31 // Supported UI scale factors for the platform. This is used as an index |
32 // into the array |kScaleFactorScales| which maps the enum value to a float. | 32 // into the array |kScaleFactorScales| which maps the enum value to a float. |
33 // SCALE_FACTOR_NONE is used for density independent resources such as | 33 // SCALE_FACTOR_NONE is used for density independent resources such as |
34 // string, html/js files or an image that can be used for any scale factors | 34 // string, html/js files or an image that can be used for any scale factors |
35 // (such as wallpapers). | 35 // (such as wallpapers). |
36 enum ScaleFactor { | 36 enum ScaleFactor { |
37 SCALE_FACTOR_NONE = 0, | 37 SCALE_FACTOR_NONE = 0, |
38 SCALE_FACTOR_100P, | 38 SCALE_FACTOR_100P, |
| 39 SCALE_FACTOR_125P, |
39 SCALE_FACTOR_133P, | 40 SCALE_FACTOR_133P, |
40 SCALE_FACTOR_140P, | 41 SCALE_FACTOR_140P, |
41 SCALE_FACTOR_150P, | 42 SCALE_FACTOR_150P, |
42 SCALE_FACTOR_180P, | 43 SCALE_FACTOR_180P, |
43 SCALE_FACTOR_200P, | 44 SCALE_FACTOR_200P, |
44 | 45 |
45 NUM_SCALE_FACTORS // This always appears last. | 46 NUM_SCALE_FACTORS // This always appears last. |
46 }; | 47 }; |
47 | 48 |
48 // Returns the float scale value for |scale_factor|. | 49 // Returns the float scale value for |scale_factor|. |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 const std::vector<ui::ScaleFactor> original_scale_factors_; | 88 const std::vector<ui::ScaleFactor> original_scale_factors_; |
88 | 89 |
89 DISALLOW_COPY_AND_ASSIGN(ScopedSetSupportedScaleFactors); | 90 DISALLOW_COPY_AND_ASSIGN(ScopedSetSupportedScaleFactors); |
90 }; | 91 }; |
91 | 92 |
92 } // namespace test | 93 } // namespace test |
93 | 94 |
94 } // namespace ui | 95 } // namespace ui |
95 | 96 |
96 #endif // UI_BASE_LAYOUT_H_ | 97 #endif // UI_BASE_LAYOUT_H_ |
OLD | NEW |