Promotes more accessors from WmShell to Shell

ash/common/mojo_interface_factory.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/mojo_interface_factory.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/cast_config_controller.h"
 #include "ash/common/media_controller.h"
 #include "ash/common/new_window_controller.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shutdown_controller.h"
 #include "ash/common/system/chromeos/network/vpn_list.h"
 #include "ash/common/system/locale/locale_notification_controller.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "ui/app_list/presenter/app_list.h"
 
 namespace ash {
 
 namespace {
 
 void BindAcceleratorControllerRequestOnMainThread(
@@ skipping 29 matching lines @@
     mojom::SessionControllerRequest request) {
   Shell::Get()->session_controller()->BindRequest(std::move(request));
 }
 
 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
   Shell::Get()->shelf_controller()->BindRequest(std::move(request));
 }
 
 void BindShutdownControllerRequestOnMainThread(
     mojom::ShutdownControllerRequest request) {
-  WmShell::Get()->shutdown_controller()->BindRequest(std::move(request));
+  Shell::Get()->shutdown_controller()->BindRequest(std::move(request));
 }
 
 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
   Shell::Get()->system_tray_controller()->BindRequest(std::move(request));
 }
 
 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) {
   Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request));
 }
 
 void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) {
-  WmShell::Get()->vpn_list()->BindRequest(std::move(request));
+  Shell::Get()->vpn_list()->BindRequest(std::move(request));
 }
 
 void BindWallpaperRequestOnMainThread(
     mojom::WallpaperControllerRequest request) {
   Shell::GetInstance()->wallpaper_controller()->BindRequest(std::move(request));
 }
 
 }  // namespace
 
 namespace mojo_interface_factory {
@@ skipping 28 matching lines @@
                          main_thread_task_runner);
   registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread),
                          main_thread_task_runner);
   registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
                          main_thread_task_runner);
 }
 
 }  // namespace mojo_interface_factory
 
 }  // namespace ash