| Index: ash/common/shelf/shelf_widget.cc
|
| diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
|
| index 7b37ef48f3312f586a8f87addc22eab5000e72dc..4ebc52eec6e2f401e9dc2457ebc6ad257f9642a1 100644
|
| --- a/ash/common/shelf/shelf_widget.cc
|
| +++ b/ash/common/shelf/shelf_widget.cc
|
| @@ -331,12 +331,6 @@ void ShelfWidget::PostCreateShelf() {
|
| // Ensure the newly created |shelf_| gets current values.
|
| background_animator_.Initialize(this);
|
|
|
| - // TODO(jamescook): The IsActiveUserSessionStarted() check may not be needed
|
| - // because the shelf is only created after the first user session is active.
|
| - // The ShelfView seems to always be visible after login. At the lock screen
|
| - // the shelf is hidden because its container is hidden. During auto-hide it is
|
| - // hidden because ShelfWidget is transparent. Some of the ShelfView visibility
|
| - // code could be simplified. http://crbug.com/674773
|
| shelf_view_->SetVisible(
|
| WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted());
|
| shelf_layout_manager_->LayoutShelf();
|
| @@ -348,6 +342,11 @@ bool ShelfWidget::IsShelfVisible() const {
|
| return shelf_view_ && shelf_view_->visible();
|
| }
|
|
|
| +void ShelfWidget::SetShelfVisibility(bool visible) {
|
| + if (shelf_view_)
|
| + shelf_view_->SetVisible(visible);
|
| +}
|
| +
|
| bool ShelfWidget::IsShowingAppList() const {
|
| return GetAppListButton() && GetAppListButton()->is_showing_app_list();
|
| }
|
|
|