| Index: ui/base/layout.cc
|
| diff --git a/ui/base/layout.cc b/ui/base/layout.cc
|
| index 6fef499542c57632fb6afc58a7d821309ce5d193..77e49219b68dfc6dac18dc2122ac8d5dc3a41fca 100644
|
| --- a/ui/base/layout.cc
|
| +++ b/ui/base/layout.cc
|
| @@ -64,7 +64,7 @@ bool UseTouchOptimizedUI() {
|
| }
|
| #endif // defined(OS_WIN)
|
|
|
| -const float kScaleFactorScales[] = {1.0f, 1.4f, 1.8f, 2.0f};
|
| +const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.8f, 2.0f};
|
| COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
|
| kScaleFactorScales_incorrect_size);
|
| const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
|
| @@ -94,8 +94,12 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {
|
| supported_scale_factors->push_back(SCALE_FACTOR_140P);
|
| supported_scale_factors->push_back(SCALE_FACTOR_180P);
|
| }
|
| -#elif defined(USE_ASH)
|
| - supported_scale_factors->push_back(SCALE_FACTOR_200P);
|
| +#elif defined(OS_CHROMEOS)
|
| + // On ChromeOS, we only support 200P on the device that has 200P.
|
| + if (ResourceBundle::GetSharedInstance().max_scale_factor() ==
|
| + SCALE_FACTOR_200P) {
|
| + supported_scale_factors->push_back(SCALE_FACTOR_200P);
|
| + }
|
| #endif
|
| std::sort(supported_scale_factors->begin(),
|
| supported_scale_factors->end(),
|
| @@ -134,6 +138,7 @@ ScaleFactor GetScaleFactorFromScale(float scale) {
|
| smallest_diff = diff;
|
| }
|
| }
|
| + DCHECK_NE(closest_match, SCALE_FACTOR_NONE);
|
| return closest_match;
|
| }
|
|
|
| @@ -142,11 +147,7 @@ float GetScaleFactorScale(ScaleFactor scale_factor) {
|
| }
|
|
|
| ScaleFactor GetMaxScaleFactor() {
|
| -#if defined(OS_CHROMEOS)
|
| - return ResourceBundle::GetSharedInstance().max_scale_factor();
|
| -#else
|
| return GetSupportedScaleFactorsInternal().back();
|
| -#endif
|
| }
|
|
|
| std::vector<ScaleFactor> GetSupportedScaleFactors() {
|
|
|