| Index: ash/common/shelf/shelf_widget.cc
|
| diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
|
| index 256c532a8a9f539fac6705bb20b7d19d1f49240b..b18416c63109e868cba13ae3a8a2c15cb297f147 100644
|
| --- a/ash/common/shelf/shelf_widget.cc
|
| +++ b/ash/common/shelf/shelf_widget.cc
|
| @@ -250,6 +250,9 @@ void ShelfWidget::PostCreateShelf() {
|
| // 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
|
| + // TODO(jdufualt|jamescook): Remove CHECK and shelf_view_->SetVisible call in
|
| + // m60 or beyond (see above TODO).
|
| + CHECK(Shell::Get()->session_controller()->IsActiveUserSessionStarted());
|
| shelf_view_->SetVisible(
|
| Shell::Get()->session_controller()->IsActiveUserSessionStarted());
|
| shelf_layout_manager_->LayoutShelf();
|
|
|