| Index: ui/display/manager/chromeos/display_change_observer_unittest.cc
|
| diff --git a/ui/display/manager/chromeos/display_change_observer_unittest.cc b/ui/display/manager/chromeos/display_change_observer_unittest.cc
|
| index e0d4ad5c9e0a4242b96113ad80a6154e73666c65..754d9c81893daddd243608fa9e2b00ed988720c7 100644
|
| --- a/ui/display/manager/chromeos/display_change_observer_unittest.cc
|
| +++ b/ui/display/manager/chromeos/display_change_observer_unittest.cc
|
| @@ -330,18 +330,21 @@ TEST(DisplayChangeObserverTest, FindDeviceScaleFactor) {
|
| // 12.1" 1280x800
|
| EXPECT_EQ(1.0f, ComputeDeviceScaleFactor(12.1f, gfx::Rect(1280, 800)));
|
|
|
| - // 11.6" 1920x1080
|
| - EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(11.6f, gfx::Rect(1920, 1080)));
|
| -
|
| // 13.3" 1920x1080
|
| EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(13.3f, gfx::Rect(1920, 1080)));
|
|
|
| // 14" 1920x1080
|
| EXPECT_EQ(1.25f, ComputeDeviceScaleFactor(14.0f, gfx::Rect(1920, 1080)));
|
|
|
| + // 11.6" 1920x1080
|
| + EXPECT_EQ(1.5f, ComputeDeviceScaleFactor(11.6f, gfx::Rect(1920, 1080)));
|
| +
|
| // 12.85" 2560x1700
|
| EXPECT_EQ(2.0f, ComputeDeviceScaleFactor(12.85f, gfx::Rect(2560, 1700)));
|
|
|
| + // 12.3" 2400x1600
|
| + EXPECT_EQ(2.0f, ComputeDeviceScaleFactor(12.3f, gfx::Rect(2400, 1600)));
|
| +
|
| // Erroneous values should still work.
|
| EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(-100.0f));
|
| EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(0.0f));
|
|
|