Recent update to Windows 8.1 added new default High DPI mode - 250% for qHD displays.

This is initial work package to reflect this change, making it possible to add hi-resolution resources in the future (if needed).

Review URL: https://codereview.chromium.org/327503003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276551 0039d316-1c4b-4281-b951-d872f2087c98

ui/base/layout.cc

@@ -35,7 +35,7 @@ bool ScaleFactorComparator(const ScaleFactor& lhs, const ScaleFactor& rhs){
 std::vector<ScaleFactor>* g_supported_scale_factors = NULL;
 
 const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f,
-                                    2.0f, 3.0f};
+                                    2.0f, 2.5f, 3.0f};
 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
                kScaleFactorScales_incorrect_size);
 

ui/base/layout.h

@@ -27,6 +27,7 @@ enum ScaleFactor {
   SCALE_FACTOR_150P,
   SCALE_FACTOR_180P,
   SCALE_FACTOR_200P,
+  SCALE_FACTOR_250P,
   SCALE_FACTOR_300P,
 
   NUM_SCALE_FACTORS  // This always appears last.

ui/base/layout_unittest.cc

@@ -21,6 +21,7 @@ TEST(LayoutTest, GetScaleFactorScale) {
   EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P));
   EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P));
   EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P));
+  EXPECT_FLOAT_EQ(2.5f, GetScaleForScaleFactor(SCALE_FACTOR_250P));
   EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P));
 }
 
@@ -61,6 +62,10 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f));
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f));
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f));
+  EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.3f));
+  EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.5f));
+  EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.6f));
+  EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(2.9f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.0f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.1f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(999.0f));