Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Unified Diff: ash/common/shelf/shelf_widget.cc

Issue 2773473003: cros: Add CHECK to ShelfWidget initialization enabling future cleanup. (Closed)
Patch Set: Initial upload Created 3 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698