ash/display/multi_display_manager.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/multi_display_manager.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 new addition 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/multi_display_manager.cc

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

index c754868299e0fdad8ea1e9eb84fe55410c0e25d9..5cb7cfd0bbc06a46693aeb70983573c86bd65757 100644

--- a/ash/display/multi_display_manager.cc

+++ b/ash/display/multi_display_manager.cc

@@ -211,7 +211,7 @@ void MultiDisplayManager::OnNativeDisplaysChanged(

std::vector<size_t> added_display_indices;

gfx::Display current_primary;

if (Shell::HasInstance())

- current_primary = gfx::Screen::GetPrimaryDisplay();

+ current_primary = Shell::GetScreen()->GetPrimaryDisplay();

for (DisplayList::iterator curr_iter = displays_.begin(),

new_iter = new_displays.begin();

« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/display/screen_position_controller.cc » ('j') | no next file with comments »