Moves Shell::CreateShelf() to WmShell

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/common/wm_root_window_controller.h"
 
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
@@ skipping 167 matching lines @@
         WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()
             ? kShellWindowId_LockSystemModalContainer
             : kShellWindowId_SystemModalContainer;
     modal_container = GetContainer(modal_window_id);
   }
   return modal_container ? static_cast<SystemModalContainerLayoutManager*>(
                                modal_container->GetLayoutManager())
                          : nullptr;
 }
 
+void WmRootWindowController::CreateShelf() {
+  WmShelf* shelf = GetShelf();
+  if (shelf->IsShelfInitialized())
+    return;
+  shelf->InitializeShelf();
+
+  if (panel_layout_manager_)
+    panel_layout_manager_->SetShelf(shelf);
+  if (docked_window_layout_manager_) {
+    docked_window_layout_manager_->SetShelf(shelf);
+    if (shelf->shelf_layout_manager())
+      docked_window_layout_manager_->AddObserver(shelf->shelf_layout_manager());
+  }
+
+  // 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(GetWindow());
+
+  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();
 }
 
 WmWindow* WmRootWindowController::GetContainer(int container_id) {
@@ skipping 350 matching lines @@
 }
 
 void WmRootWindowController::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
   GetShelf()->UpdateVisibilityState();
 }
 
 }  // namespace ash