ash/accelerators/accelerator_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/accelerators/accelerator_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: win fix 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/accelerators/accelerator_controller.cc

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc

index bc742c74cb6f419442a9cbb330a5129f90865cf4..782ca378a8ac9f4b10a7ac02203b92c5bf45ae75 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -123,7 +123,7 @@ void HandleCycleDisplayMode() {

}

void HandleSwapPrimaryDisplay() {

- if (gfx::Screen::GetNumDisplays() > 1) {

+ if (ash::Shell::GetAshScreen()->GetNumDisplays() > 1) {

Shell::GetInstance()->display_controller()->SetPrimaryDisplay(

ScreenAsh::GetSecondaryDisplay());

}

« no previous file with comments | « no previous file | ash/dip_unittest.cc » ('j') | ash/shell.cc » ('J')