ash/screen_ash.cc - Issue 10952028: Fix crashers in GetPrimaryDisplay

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

Issue 10952028: Fix crashers in GetPrimaryDisplay (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: return display by value Created 8 years, 3 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/screen_ash.cc

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

index e72dfb1705f3525dcbd354fb3296814b5229e20f..efda02240d0849c533e6c4044d836a50d6bbb515 100644

--- a/ash/screen_ash.cc

+++ b/ash/screen_ash.cc

@@ -117,7 +117,7 @@ gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {

}

gfx::Display ScreenAsh::GetPrimaryDisplay() const {

- return Shell::GetInstance()->display_controller()->primary_display();

+ return DisplayController::GetPrimaryDisplay();

}

} // namespace ash