Revert of Reland: chromeos: Fix shelf appearing at login screen under mash

ash/common/wm_root_window_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_widget.h"
@@ skipping 230 matching lines @@
 
   // Notify shell observers that the shelf has been created.
   // TODO(jamescook): Move this into WmShelf::InitializeShelf(). This will
   // require changing AttachedPanelWidgetTargeter's access to WmShelf.
   WmShell::Get()->NotifyShelfCreatedForRootWindow(
       WmWindowAura::Get(GetRootWindow()));
 
   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());
 }
 
 const WmWindow* RootWindowController::GetWmContainer(int container_id) const {
   const aura::Window* window = GetContainer(container_id);
   return WmWindowAura::Get(window);
 }
 
 void RootWindowController::ConfigureWidgetInitParamsForContainer(
@@ skipping 363 matching lines @@
 }
 
 void RootWindowController::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
   wm_shelf_->UpdateVisibilityState();
 }
 
 }  // namespace ash