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

Unified Diff: chrome/browser/chromeos/display/display_preferences_unittest.cc

Issue 2426103004: Specify a default display UI scale to reset the zoom to (Closed)
Patch Set: Working test Created 4 years, 2 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/wm/ash_native_cursor_manager_unittest.cc ('k') | ui/display/manager/display_manager_utilities.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 1ea1141e035be7a79c2394ac09cd81efea5af462..47bff749fe041ff74d0e91bcdd64e38f7ea64066 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -300,8 +300,10 @@ TEST_F(DisplayPreferencesTest, BasicStores) {
window_tree_host_manager->SetOverscanInsets(id1, gfx::Insets(10, 11, 12, 13));
display_manager()->SetDisplayRotation(id1, display::Display::ROTATE_90,
display::Display::ROTATION_SOURCE_USER);
- EXPECT_TRUE(display_manager()->SetDisplayUIScale(id1, 1.25f));
- EXPECT_FALSE(display_manager()->SetDisplayUIScale(id2, 1.25f));
+ EXPECT_TRUE(ash::test::DisplayManagerTestApi(display_manager())
+ .SetDisplayUIScale(id1, 1.25f));
+ EXPECT_FALSE(ash::test::DisplayManagerTestApi(display_manager())
+ .SetDisplayUIScale(id2, 1.25f));
const base::DictionaryValue* displays =
local_state()->GetDictionary(prefs::kSecondaryDisplays);
@@ -678,7 +680,8 @@ TEST_F(DisplayPreferencesTest, DontStoreInGuestMode) {
int64_t id2 = display_manager()->GetSecondaryDisplay().id();
display_manager()->SetLayoutForCurrentDisplays(ash::test::CreateDisplayLayout(
display_manager(), display::DisplayPlacement::TOP, 10));
- display_manager()->SetDisplayUIScale(id1, 1.25f);
+ ash::test::DisplayManagerTestApi(display_manager())
+ .SetDisplayUIScale(id1, 1.25f);
window_tree_host_manager->SetPrimaryDisplayId(id2);
int64_t new_primary = display::Screen::GetScreen()->GetPrimaryDisplay().id();
window_tree_host_manager->SetOverscanInsets(new_primary,
« no previous file with comments | « ash/wm/ash_native_cursor_manager_unittest.cc ('k') | ui/display/manager/display_manager_utilities.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698