ash/display/screen_ash.cc - Issue 1107733006: Unified Desktop: hook up ash to allow unified desktop mode

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/screen_ash.cc

Issue 1107733006: Unified Desktop: hook up ash to allow unified desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« ash/display/root_window_transformers.cc ('K') | « ash/display/root_window_transformers_unittest.cc ('k') | ash/host/ash_window_tree_host.h » ('j') | ash/host/ash_window_tree_host_virtual.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/screen_ash.cc

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

index 700abe6e03a6b99f3af7637eb82c644ae7f052f7..5941bccfa742c156116299089cddc4d1d0232717 100644

--- a/ash/display/screen_ash.cc

+++ b/ash/display/screen_ash.cc

@@ -165,8 +165,9 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {

DisplayManager* display_manager = GetDisplayManager();

// RootWindow needs Display to determine its device scale factor

// for non desktop display.

- if (display_manager->software_mirroring_display().id() == id)

- return display_manager->software_mirroring_display();

+ gfx::Display mirroring_display = display_manager->GetMirroringDisplayById(id);

+ if (mirroring_display.is_valid())

+ return mirroring_display;

return display_manager->GetDisplayForId(id);

}