ash/display/screen_ash.cc - Issue 1641003002: [exp] ash: Ash in Mus.

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 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot-merge Created 4 years, 11 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/screen_ash.cc

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

index d5c33a4e65b5f2c7e37828f13c25fb7be3cf048f..853669206f8301d1646bcde8d97e49a12b00cda8 100644

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

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

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

if (!root_window)

return GetPrimaryDisplay();

const RootWindowSettings* rws = GetRootWindowSettings(root_window);

+ if (!rws)

+ return GetPrimaryDisplay();

int64_t id = rws->display_id;

// if id is |kInvaildDisplayID|, it's being deleted.

DCHECK(id != gfx::Display::kInvalidDisplayID);