Move more from WmShell to Shell

ash/virtual_keyboard_controller.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 "ash/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
@@ skipping 20 matching lines @@
 bool IsSmartVirtualKeyboardEnabled() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           keyboard::switches::kEnableVirtualKeyboard)) {
     return false;
   }
   return keyboard::IsSmartDeployEnabled();
 }
 
 void MoveKeyboardToDisplayInternal(const int64_t display_id) {
   // Remove the keyboard from curent root window controller
-  WmShell::Get()->keyboard_ui()->Hide();
+  Shell::Get()->keyboard_ui()->Hide();
   RootWindowController::ForWindow(
       keyboard::KeyboardController::GetInstance()->GetContainerWindow())
       ->DeactivateKeyboard(keyboard::KeyboardController::GetInstance());
 
   for (RootWindowController* controller :
        Shell::GetInstance()->GetAllRootWindowControllers()) {
     if (display::Screen::GetScreen()
             ->GetDisplayNearestWindow(controller->GetRootWindow())
             .id() == display_id) {
       controller->ActivateKeyboard(keyboard::KeyboardController::GetInstance());
@@ skipping 160 matching lines @@
   if (is_enabled == was_enabled)
     return;
   if (is_enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash