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

ash/mus/window_manager.cc

 // Copyright 2015 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/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
+#include "ash/common/session/session_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/wm_lookup_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/non_client_frame_controller.h"
@@ skipping 111 matching lines @@
   frame_decoration_values->maximized_client_area_insets = client_area_insets;
   frame_decoration_values->max_title_bar_button_width =
       NonClientFrameController::GetMaxTitleBarButtonWidth();
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
   shell_.reset(new WmShellMus(base::MakeUnique<ShellDelegateMus>(connector_),
                               this, pointer_watcher_event_router_.get()));
   shell_->Initialize(blocking_pool);
   lookup_.reset(new WmLookupMus);
-
-  // TODO: this should be called when logged in. See http://crbug.com/654606.
-  shell_->CreateShelf();
 }
 
 aura::client::ActivationClient* WindowManager::activation_client() {
   return focus_controller_.get();
 }
 
 aura::Window* WindowManager::NewTopLevelWindow(
     ui::mojom::WindowType window_type,
     std::map<std::string, std::vector<uint8_t>>* properties) {
   RootWindowController* root_window_controller =
@@ skipping 66 matching lines @@
   aura::client::SetScreenPositionClient(window_tree_host->window(),
                                         screen_position_controller_.get());
 
   std::unique_ptr<RootWindowController> root_window_controller_ptr(
       new RootWindowController(this, std::move(window_tree_host), display,
                                root_window_type));
   RootWindowController* root_window_controller =
       root_window_controller_ptr.get();
   root_window_controllers_.insert(std::move(root_window_controller_ptr));
 
-  // TODO: this should be called when logged in. See http://crbug.com/654606.
-  root_window_controller->ash_root_window_controller()
-      ->CreateShelf();
+  // Create a shelf if a user is already logged in.
+  if (shell_->session_controller()->NumberOfLoggedInUsers())
+    root_window_controller->ash_root_window_controller()->CreateShelf();
 
   for (auto& observer : observers_)
     observer.OnRootWindowControllerAdded(root_window_controller);
 
   for (auto& observer : *screen_->display_list().observers())
     observer.OnDisplayAdded(root_window_controller->display());
 
   return root_window_controller;
 }
 
@@ skipping 268 matching lines @@
 
 void WindowManager::OnWindowInitialized(aura::Window* window) {
   // This ensures WmWindowAura won't be called before WmWindowMus. This is
   // important as if WmWindowAura::Get() is called first, then WmWindowAura
   // would be created, not WmWindowMus.
   WmWindowMus::Get(window);
 }
 
 }  // namespace mus
 }  // namespace ash