Re-reland: chromeos: Fix shelf appearing at login screen under mash

ash/common/wm_root_window_controller.cc

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 9063e9519dc0537e2aedc729afbc1ad680e738c9..c3207c18f8c9077bbfca1b0cf80201adab6fc6b6 100644
--- a/ash/common/wm_root_window_controller.cc
+++ b/ash/common/wm_root_window_controller.cc
@@ -221,15 +221,6 @@ 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())