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

Unified Diff: ash/common/wm_root_window_controller.cc

Issue 2628933003: Revert of Reland: 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/test/test_session_state_delegate.cc ('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 06ab6f220e5609a9ad1c5c070acc53fc5c474229..35767001cb64d8c275996d988de5fe5d05433f4c 100644
--- a/ash/common/wm_root_window_controller.cc
+++ b/ash/common/wm_root_window_controller.cc
@@ -248,6 +248,14 @@
wm_shelf_->shelf_widget()->PostCreateShelf();
}
+void RootWindowController::ShowShelf() {
+ if (!wm_shelf_->IsShelfInitialized())
+ return;
+ // TODO(jamescook): Move this into WmShelf.
+ wm_shelf_->shelf_widget()->SetShelfVisibility(true);
+ wm_shelf_->shelf_widget()->status_area_widget()->Show();
+}
+
const WmWindow* RootWindowController::GetWindow() const {
return WmWindowAura::Get(GetRootWindow());
}
« no previous file with comments | « ash/common/test/test_session_state_delegate.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698