Moves Shell::CreateShelf() to WmShell

ash/root_window_controller.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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 293 matching lines @@
 }
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
   return GetRootWindow()->GetChildById(container_id);
 }
 
 const aura::Window* RootWindowController::GetContainer(int container_id) const {
   return ash_host_->AsWindowTreeHost()->window()->GetChildById(container_id);
 }
 
-void RootWindowController::CreateShelf() {
-  if (wm_shelf_aura_->IsShelfInitialized())
-    return;
-  wm_shelf_aura_->InitializeShelf();
-
-  if (panel_layout_manager())
-    panel_layout_manager()->SetShelf(wm_shelf_aura_.get());
-  if (docked_window_layout_manager()) {
-    docked_window_layout_manager()->SetShelf(wm_shelf_aura_.get());
-    if (wm_shelf_aura_->shelf_layout_manager()) {
-      docked_window_layout_manager()->AddObserver(
-          wm_shelf_aura_->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(
-      WmWindowAura::Get(GetRootWindow()));
-
-  wm_shelf_aura_->shelf_widget()->PostCreateShelf();
-}
-
 void RootWindowController::UpdateAfterLoginStatusChange(LoginStatus status) {
   if (status != LoginStatus::NOT_LOGGED_IN)
     mouse_event_target_.reset();
   StatusAreaWidget* status_area_widget =
       wm_shelf_aura_->shelf_widget()->status_area_widget();
   if (status_area_widget)
     status_area_widget->UpdateAfterLoginStatusChange(status);
 }
 
 void RootWindowController::OnInitialWallpaperAnimationStarted() {
@@ skipping 172 matching lines @@
   WmShell::Get()->AddShellObserver(this);
 
   wm_root_window_controller_->root_window_layout_manager()->OnWindowResized();
   if (root_window_type == PRIMARY) {
     shell->InitKeyboard();
   } else {
     ash_host_->AsWindowTreeHost()->Show();
 
     // Create a shelf if a user is already logged in.
     if (WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers())
-      CreateShelf();
+      wm_root_window_controller_->CreateShelf();
 
     // Notify shell observers about new root window.
     shell->OnRootWindowAdded(WmWindowAura::Get(root_window));
   }
 
 #if defined(OS_CHROMEOS)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode)) {
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
   }
@@ skipping 108 matching lines @@
     EnableTouchHudProjection();
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
 }
 
 }  // namespace ash