Index: ui/base/layout.cc |
diff --git a/ui/base/layout.cc b/ui/base/layout.cc |
index 6fef499542c57632fb6afc58a7d821309ce5d193..674f76f079b7ceecb9fa0aad953a3f68784d7889 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); |
@@ -134,6 +134,7 @@ ScaleFactor GetScaleFactorFromScale(float scale) { |
smallest_diff = diff; |
} |
} |
+ DCHECK_NE(closest_match, SCALE_FACTOR_NONE); |
return closest_match; |
} |