ash/display/display_controller.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix other os's 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

Index: ash/display/display_controller.cc

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

index b7361c375631f5872f888d4edf2034aad5febb37..dccc2263981c8fc0d489c9e75982714df84de96f 100644

--- a/ash/display/display_controller.cc

+++ b/ash/display/display_controller.cc

@@ -469,10 +469,10 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay(

}

void DisplayController::UpdateDisplayBoundsForLayout() {

- if (gfx::Screen::GetNumDisplays() <= 1)

+ if (gfx::Screen::GetNumDisplays(ash::Shell::GetRootNativeView()) <= 1)

return;

- DCHECK_EQ(2, gfx::Screen::GetNumDisplays());

+ DCHECK_EQ(2, gfx::Screen::GetNumDisplays(ash::Shell::GetRootNativeView()));

const gfx::Rect& primary_bounds = GetPrimaryDisplay().bounds();

gfx::Display* secondary_display = GetSecondaryDisplay();

« no previous file with comments | « no previous file | ash/display/display_controller_unittest.cc » ('j') | chrome/browser/ui/panels/panel_mouse_watcher_timer.cc » ('J')