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

Unified Diff: ash/root_window_controller.cc

Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase, fix conflict with sky 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/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 2eb1dbf9a19d0cec6107e811d17d113efe3acfe2..78b101441c362e1800a1565b99474d7a32501ee9 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -371,14 +371,6 @@ void RootWindowController::CreateShelf() {
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();
-}
-
ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
return wm_shelf_->shelf_layout_manager();
}
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698