ash: Remove ash::Shelf in favor of ash::WmShelf

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"
 
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wallpaper/wallpaper_controller.h"
 #include "base/rand_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/camera_detector.h"
 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
@@ skipping 349 matching lines @@
 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(
     Profile* manager_profile) {
   DBusThreadManager::Get()
       ->GetSessionManagerClient()
       ->NotifySupervisedUserCreationStarted();
   manager_signin_in_progress_ = false;
   DCHECK(controller_.get());
   // For manager user, move wallpaper to locked container so that windows
   // created during the user image picker step are below it.
   ash::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer();
-  ash::Shelf::ForPrimaryDisplay()->wm_shelf()->SetAlignment(
-      ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);
+  ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow())
+      ->SetAlignment(ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);
 
   controller_->SetManagerProfile(manager_profile);
   if (actor_)
     actor_->ShowUsernamePage();
 
   last_page_ = kNameOfNewUserParametersScreen;
   CHECK(!sync_service_);
   sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile(
       manager_profile);
   sync_service_->AddObserver(this);
@@ skipping 238 matching lines @@
     selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 }
 
 void SupervisedUserCreationScreen::OnImageAccepted() {
 }
 
 }  // namespace chromeos