| 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())
|
|
|