Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1193)

Unified Diff: ash/display/display_info_unittest.cc

Issue 1251573006: Cleanup: Enable 125DSFForUIScaling on by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_info.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_info_unittest.cc
diff --git a/ash/display/display_info_unittest.cc b/ash/display/display_info_unittest.cc
index 7c5da69f402c3c91fdad9306c7acdc75f36a7707..7f29d042ebad5a7211d4fbfd523032416087ce0a 100644
--- a/ash/display/display_info_unittest.cc
+++ b/ash/display/display_info_unittest.cc
@@ -110,23 +110,19 @@ TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIPHiDPI) {
}
TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIP125) {
- DisplayInfo::SetUse125DSFForUIScaling(true);
gfx::Size size(1920, 1080);
EXPECT_EQ("2400x1350", GetModeSizeInDIP(size, 1.25f, 1.25f, true));
EXPECT_EQ("1920x1080", GetModeSizeInDIP(size, 1.25f, 1.0f, true));
EXPECT_EQ("1536x864", GetModeSizeInDIP(size, 1.25f, 0.8f, true));
EXPECT_EQ("1200x675", GetModeSizeInDIP(size, 1.25f, 0.625f, true));
EXPECT_EQ("960x540", GetModeSizeInDIP(size, 1.25f, 0.5f, true));
- DisplayInfo::SetUse125DSFForUIScaling(false);
}
TEST_F(DisplayInfoTest, DisplayModeGetSizeForExternal4K) {
- DisplayInfo::SetUse125DSFForUIScaling(true);
gfx::Size size(3840, 2160);
EXPECT_EQ("1920x1080", GetModeSizeInDIP(size, 2.0f, 1.0f, false));
EXPECT_EQ("3072x1728", GetModeSizeInDIP(size, 1.25f, 1.0f, false));
EXPECT_EQ("3840x2160", GetModeSizeInDIP(size, 1.0f, 1.0f, false));
- DisplayInfo::SetUse125DSFForUIScaling(false);
}
} // namespace ash
« no previous file with comments | « ash/display/display_info.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698