Manual Revert of Reland: chromeos: Fix shelf appearing at login screen under mash (patchset #7 id:1…

ash/common/wm_shell.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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
@@ skipping 135 matching lines @@
 void WmShell::CreateShelf() {
   // Must occur after SessionStateDelegate creation and user login.
   DCHECK(GetSessionStateDelegate());
   DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
   CreateShelfDelegate();
 
   for (WmWindow* root_window : GetAllRootWindows())
     root_window->GetRootWindowController()->CreateShelf();
 }
 
+void WmShell::ShowShelf() {
+  for (WmWindow* root_window : GetAllRootWindows())
+    root_window->GetRootWindowController()->ShowShelf();
+}
+
 void WmShell::CreateShelfDelegate() {
   // May be called multiple times as shelves are created and destroyed.
   if (shelf_delegate_)
     return;
   // Must occur after SessionStateDelegate creation and user login because
   // Chrome's implementation of ShelfDelegate assumes it can get information
   // about multi-profile login state.
   DCHECK(GetSessionStateDelegate());
   DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
   shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model()));
@@ skipping 96 matching lines @@
       session_controller_(base::MakeUnique<SessionController>()),
       shelf_controller_(base::MakeUnique<ShelfController>()),
       shutdown_controller_(base::MakeUnique<ShutdownController>()),
       system_tray_controller_(base::MakeUnique<SystemTrayController>()),
       system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
       vpn_list_(base::MakeUnique<VpnList>()),
       wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
       window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
       window_selector_controller_(
           base::MakeUnique<WindowSelectorController>()) {
-  session_controller_->AddSessionStateObserver(this);
 
   prefs::mojom::PreferencesManagerPtr pref_manager_ptr;
   // Can be null in tests.
   if (!delegate_->GetShellConnector())
     return;
   delegate_->GetShellConnector()->BindInterface(prefs::mojom::kServiceName,
                                                 &pref_manager_ptr);
   pref_store_ = new preferences::PrefObserverStore(std::move(pref_manager_ptr));
 }
 
-WmShell::~WmShell() {
-  session_controller_->RemoveSessionStateObserver(this);
-}
+WmShell::~WmShell() {}
 
 RootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
 }
 
 WmWindow* WmShell::GetRootWindowForNewWindows() {
   if (scoped_root_window_for_new_windows_)
     return scoped_root_window_for_new_windows_;
   return root_window_for_new_windows_;
 }
@@ skipping 113 matching lines @@
 
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
-void WmShell::SessionStateChanged(session_manager::SessionState state) {
-  // Create the shelf when a session becomes active. It's safe to do this
-  // multiple times (e.g. initial login vs. multiprofile add session).
-  if (state == session_manager::SessionState::ACTIVE)
-    CreateShelf();
-}
-
 }  // namespace ash