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

Unified Diff: ash/common/wm_root_window_controller.cc

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)
Patch Set: Created 3 years, 11 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 | « ash/common/wm_root_window_controller.h ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_root_window_controller.cc
diff --git a/ash/common/wm_root_window_controller.cc b/ash/common/wm_root_window_controller.cc
index f2851f6ac646bf4e8585bb61907f301b00bdac32..ebe7418df96caa8f552ba27737336cb5fe0a84dd 100644
--- a/ash/common/wm_root_window_controller.cc
+++ b/ash/common/wm_root_window_controller.cc
@@ -215,6 +215,15 @@ void WmRootWindowController::CreateShelf() {
shelf->shelf_widget()->PostCreateShelf();
}
+void WmRootWindowController::ShowShelf() {
+ WmShelf* shelf = GetShelf();
+ if (!shelf->IsShelfInitialized())
+ return;
+ // TODO(jamescook): Move this into WmShelf.
+ shelf->shelf_widget()->SetShelfVisibility(true);
+ shelf->shelf_widget()->status_area_widget()->Show();
+}
+
SystemTray* WmRootWindowController::GetSystemTray() {
ShelfWidget* shelf_widget = GetShelf()->shelf_widget();
if (!shelf_widget || !shelf_widget->status_area_widget())
« no previous file with comments | « ash/common/wm_root_window_controller.h ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698