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

Unified Diff: ash/display/multi_display_manager.cc

Issue 11066130: Fix for out-of-sync scale factor issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use API that exists on 23 Created 8 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 | « no previous file | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager.cc
diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc
index 6df0887384e8c1b25d1adf9722440237cbef4638..0a4410392b3ab56246e81a5b04617da335c63c1f 100644
--- a/ash/display/multi_display_manager.cc
+++ b/ash/display/multi_display_manager.cc
@@ -317,7 +317,9 @@ const gfx::Display& MultiDisplayManager::GetDisplayNearestWindow(
return DisplayController::GetPrimaryDisplay();
const RootWindow* root = window->GetRootWindow();
MultiDisplayManager* manager = const_cast<MultiDisplayManager*>(this);
- return root ? manager->FindDisplayForRootWindow(root) : GetInvalidDisplay();
+ return root ?
+ manager->FindDisplayForRootWindow(root) :
+ *manager->GetDisplayAt(0);
}
const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint(
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698