ash/wm/shelf_layout_manager.cc - Issue 10823350: Re-factor system tray code controlling launcher visibility

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

Issue 10823350: Re-factor system tray code controlling launcher visibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 4 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/shelf_layout_manager.cc

diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc

index a621c4aa21ad1da62e3b064cddc248322e589f8d..5f490eae6613d06b7d8b094e0427c0f927268110 100644

--- a/ash/wm/shelf_layout_manager.cc

+++ b/ash/wm/shelf_layout_manager.cc

@@ -544,7 +544,8 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(

if (shell->GetAppListTargetVisibility())

return AUTO_HIDE_SHOWN;

- if (shell->system_tray() && shell->system_tray()->should_show_launcher())

+ if (shell->status_area_widget() &&

+ shell->status_area_widget()->should_show_launcher())

return AUTO_HIDE_SHOWN;

if (launcher_ && launcher_->IsShowingMenu())