Moves Shell::CreateShelf() to WmShell

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 257 matching lines @@
     return;
   }
 }
 
 void Shell::OnLoginStateChanged(LoginStatus status) {
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
                     OnLoginStateChanged(status));
 }
 
 void Shell::OnLoginUserProfilePrepared() {
-  CreateShelf();
+  wm_shell_->CreateShelf();
   CreateKeyboard();
 }
 
 void Shell::UpdateAfterLoginStatusChange(LoginStatus status) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->UpdateAfterLoginStatusChange(status);
 }
 
@@ skipping 22 matching lines @@
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
                     OnCastingSessionStartedOrStopped(started));
 #endif
 }
 
 void Shell::OnRootWindowAdded(WmWindow* root_window) {
   FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(),
                     OnRootWindowAdded(root_window));
 }
 
-void Shell::CreateShelf() {
-  // Must occur after SessionStateDelegate creation and user login.
-  DCHECK(session_state_delegate_);
-  DCHECK_GT(session_state_delegate_->NumberOfLoggedInUsers(), 0);
-  wm_shell_->CreateShelfDelegate();
-
-  RootWindowControllerList controllers = GetAllRootWindowControllers();
-  for (RootWindowControllerList::iterator iter = controllers.begin();
-       iter != controllers.end(); ++iter)
-    (*iter)->CreateShelf();
-}
-
 void Shell::CreateKeyboard() {
   // TODO(bshe): Primary root window controller may not be the controller to
   // attach virtual keyboard. See http://crbug.com/303429
   InitKeyboard();
   GetPrimaryRootWindowController()->ActivateKeyboard(
       keyboard::KeyboardController::GetInstance());
 }
 
 void Shell::DeactivateKeyboard() {
   // TODO(jamescook): Move keyboard create and hide into WmShell.
@@ skipping 573 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash