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

Unified Diff: ash/wm/ash_native_cursor_manager_unittest.cc

Issue 579053002: Remove "upgrading to 2x DSF for lower UI scale when 2x resoruces are available" option (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 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_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager_unittest.cc
diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc
index 695a965872b9c7c03940a27aa3884987ba0d0fd1..66817f57c08f3a4f081dc56aa0e5846926f4971b 100644
--- a/ash/wm/ash_native_cursor_manager_unittest.cc
+++ b/ash/wm/ash_native_cursor_manager_unittest.cc
@@ -165,7 +165,6 @@ TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
CursorManagerTestApi test_api(cursor_manager);
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- DisplayInfo::SetAllowUpgradeToHighDPI(false);
display_manager->SetDisplayUIScale(display_id, 0.5f);
EXPECT_EQ(1.0f,
Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
@@ -173,13 +172,6 @@ TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
display_manager->SetDisplayUIScale(display_id, 1.0f);
- DisplayInfo::SetAllowUpgradeToHighDPI(true);
- // 1x display should keep using 1x cursor even if the DSF is upgraded to 2x.
- display_manager->SetDisplayUIScale(display_id, 0.5f);
- EXPECT_EQ(2.0f,
- Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
- EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
-
// 2x display should keep using 2x cursor regardless of the UI scale.
UpdateDisplay("800x800*2");
EXPECT_EQ(2.0f,
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698