ash/wm/workspace/frame_maximize_button.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/workspace/frame_maximize_button.cc

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

Patch Set: rebase 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/workspace/frame_maximize_button.cc

diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc

index 76415d05738331cd4c6726d424ece968ed645f11..23192407314edcb8251dec3ed11e882e841151a9 100644

--- a/ash/wm/workspace/frame_maximize_button.cc

+++ b/ash/wm/workspace/frame_maximize_button.cc

@@ -477,7 +477,10 @@ gfx::Rect FrameMaximizeButton::ScreenBoundsForType(

window->parent(),

ScreenAsh::GetMaximizedWindowBoundsInParent(window));

case SNAP_MINIMIZE: {

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

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

+ // Launcher is created lazily and can be NULL.

+ if (!launcher)

+ return gfx::Rect();

gfx::Rect item_rect(launcher->GetScreenBoundsOfItemIconForWindow(

window));

if (!item_rect.IsEmpty()) {

« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/workspace/workspace_layout_manager2_unittest.cc » ('j') | no next file with comments »