ash/display/multi_display_manager.cc - Issue 11066130: Fix for out-of-sync scale factor issue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: ash/display/multi_display_manager.cc

diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc

index ef20b0e6302372e940877892eaa3e4adfd92e34a..bac9018f8f58b9c46d52bf89c79ff852708798a0 100644

--- a/ash/display/multi_display_manager.cc

+++ b/ash/display/multi_display_manager.cc

@@ -290,7 +290,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) :

+ DisplayController::GetPrimaryDisplay();

}

const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint(