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

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

Issue 417113012: Introduce user customization of external HighDPI mode for 4K monitor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 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
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 d33351e80a637c9acbfee15472459c4e8dd837f7..05c19b7465016a7a3f52ba133b42ac7c1e45b9c9 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -424,9 +424,15 @@ TEST_F(DisplayPreferencesTest, PreventStore) {
int64 id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();
// Set display's resolution in single display. It creates the notification and
// display preferences should not stored meanwhile.
- ash::Shell::GetInstance()->resolution_notification_controller()->
- SetDisplayResolutionAndNotify(
- id, gfx::Size(400, 300), gfx::Size(500, 400), base::Closure());
+ ash::Shell* shell = ash::Shell::GetInstance();
+ ash::DisplayMode old_mode;
+ ash::DisplayMode new_mode;
+ old_mode.size = gfx::Size(400, 300);
+ new_mode.size = gfx::Size(500, 400);
+ if (shell->display_manager()->SetDisplayMode(id, new_mode)) {
+ shell->resolution_notification_controller()->PrepareNotification(
+ id, old_mode, new_mode, base::Closure());
+ }
UpdateDisplay("500x400#500x400|400x300|300x200");
const base::DictionaryValue* properties =

Powered by Google App Engine
This is Rietveld 408576698