ash/wm/gestures/system_pinch_handler.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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/wm/gestures/system_pinch_handler.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: ash/wm/gestures/system_pinch_handler.cc

diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc

index d974addc6ba1fd2669a03a60fca1c96704242a5f..2f519b0079d6bc234469209a5dbc97e1d22eacd7 100644

--- a/ash/wm/gestures/system_pinch_handler.cc

+++ b/ash/wm/gestures/system_pinch_handler.cc

@@ -136,7 +136,7 @@ gfx::Rect SystemPinchHandler::GetPhantomWindowScreenBounds(

return window->bounds();

}

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForWindow(window);

gfx::Rect rect = launcher->GetScreenBoundsOfItemIconForWindow(target_);

if (rect.IsEmpty())

rect = launcher->widget()->GetWindowBoundsInScreen();