ash/display/screen_ash.cc - Issue 657583003: Chrome OS: Ash support for >=3 displays.

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 657583003: Chrome OS: Ash support for >=3 displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased at 306637. Created 6 years 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 d3bdd609fa0100d198ad9f42c7a44f0a96422612..936ea74c60baa11c81295961e6070f3b3773316e 100644

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

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

@@ -161,7 +161,7 @@ gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,

// static

const gfx::Display& ScreenAsh::GetSecondaryDisplay() {

DisplayManager* display_manager = GetDisplayManager();

- CHECK_EQ(2U, display_manager->GetNumDisplays());

+ CHECK_LE(2U, display_manager->GetNumDisplays());

return display_manager->GetDisplayAt(0).id() ==

Shell::GetScreen()->GetPrimaryDisplay().id() ?

display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);