chromeos: Refactor shelf to create ShelfView earlier in startup

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 401 matching lines @@
 
   is_touch_hud_projection_enabled_ = enabled;
   for (auto& observer : shell_observers_)
     observer.OnTouchHudProjectionToggled(enabled);
 }
 
 FirstRunHelper* Shell::CreateFirstRunHelper() {
   return new FirstRunHelperImpl;
 }
 
-void Shell::CreateShelfView() {
-  // Must occur after SessionController creation and user login.
-  DCHECK(session_controller());
-  DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
-
-  // Notify the ShellDelegate that the shelf is being initialized.
-  // TODO(msw): Refine ChromeLauncherController lifetime management.
-  shell_delegate_->ShelfInit();
-
-  if (!shelf_window_watcher_)
-    shelf_window_watcher_ = base::MakeUnique<ShelfWindowWatcher>(shelf_model());
-  for (WmWindow* root_window : shell_port_->GetAllRootWindows())
-    root_window->GetRootWindowController()->CreateShelfView();
-}
-
 void Shell::SetLargeCursorSizeInDip(int large_cursor_size_in_dip) {
   window_tree_host_manager_->cursor_window_controller()
       ->SetLargeCursorSizeInDip(large_cursor_size_in_dip);
 }
 
 void Shell::SetCursorCompositingEnabled(bool enabled) {
   if (GetAshConfig() == Config::CLASSIC) {
     // TODO: needs to work in mus. http://crbug.com/705592.
     window_tree_host_manager_->cursor_window_controller()
         ->SetCursorCompositingEnabled(enabled);
@@ skipping 778 matching lines @@
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   WmWindow* gained_active_wm = WmWindow::Get(gained_active);
   if (gained_active_wm)
     root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
 }
 
 void Shell::OnSessionStateChanged(session_manager::SessionState state) {
-  // Create the shelf when a session becomes active. It's safe to do this
+  // Finalize the shelf when a session becomes active. It's safe to do this

[msw, 2017/05/16 22:42:00]

nit: s/Finalize/Initialize/?

   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE) {
-    CreateShelfView();
-
+    InitializeShelf();
     if (GetAshConfig() != Config::MASH) {
       // Recreate the keyboard after initial login and after multiprofile login.
       CreateKeyboard();
     }
   }
 }
 
 void Shell::OnLoginStatusChanged(LoginStatus login_status) {
   UpdateAfterLoginStatusChange(login_status);
 }
 
 void Shell::OnLockStateChanged(bool locked) {
 #ifndef NDEBUG
   // Make sure that there is no system modal in Lock layer when unlocked.
   if (!locked) {
     aura::Window::Windows containers = wm::GetContainersFromAllRootWindows(
         kShellWindowId_LockSystemModalContainer, GetPrimaryRootWindow());
     for (aura::Window* container : containers)
       DCHECK(container->children().empty());
   }
 #endif
 }
 
+void Shell::InitializeShelf() {
+  // Must occur after SessionController creation and user login.
+  DCHECK(session_controller());
+  DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
+
+  // Notify the ShellDelegate that the shelf is being initialized.
+  // TODO(msw): Refine ChromeLauncherController lifetime management.
+  shell_delegate_->ShelfInit();
+
+  if (!shelf_window_watcher_)
+    shelf_window_watcher_ = base::MakeUnique<ShelfWindowWatcher>(shelf_model());
+  for (WmWindow* root_window : shell_port_->GetAllRootWindows())

[msw, 2017/05/16 22:42:00]

optional nit: avoid WmWindow usage.

[James Cook, 2017/05/17 16:16:13]

Done.

+    root_window->GetRootWindowController()->InitializeShelf();
+}
+
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash