ash/display/shared_display_edge_indicator.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/shared_display_edge_indicator.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/shared_display_edge_indicator.cc

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

index f4f8aabb00d46af6776437983d8d8ec27f4584fc..1abbbf5a0cfc2601a712371399e998c5a38589f7 100644

--- a/ash/display/shared_display_edge_indicator.cc

+++ b/ash/display/shared_display_edge_indicator.cc

@@ -56,7 +56,7 @@ views::Widget* CreateWidget(const gfx::Rect& bounds,

widget->SetVisibilityChangedAnimationsEnabled(false);

widget->GetNativeWindow()->SetName("SharedEdgeIndicator");

widget->SetContentsView(contents_view);

- gfx::Display display = gfx::Screen::GetDisplayMatching(bounds);

+ gfx::Display display = Shell::GetScreen()->GetDisplayMatching(bounds);

aura::Window* window = widget->GetNativeWindow();

aura::client::ScreenPositionClient* screen_position_client =

aura::client::GetScreenPositionClient(window->GetRootWindow());

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