ash/system/status_area_widget.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/system/status_area_widget.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/system/status_area_widget.cc

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc

index 59f91a7a9ac50440e5f66282c0b237456580395c..afb086ab888aa1064ef3579197789f310090132f 100644

--- a/ash/system/status_area_widget.cc

+++ b/ash/system/status_area_widget.cc

@@ -351,7 +351,7 @@ bool StatusAreaWidget::ShouldShowLauncher() const {

web_notification_tray_->IsMessageCenterBubbleVisible()))

return true;

- if (!Shell::GetInstance()->shelf()->IsVisible())

+ if (!RootWindowController::ForLauncher(GetNativeView())->shelf()->IsVisible())

return false;

// If the launcher is currently visible, don't hide the launcher if the mouse

« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »