Moves couple of WmShell methods to standalone functions

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"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
@@ skipping 106 matching lines @@
   DCHECK(keyboard::KeyboardController::GetInstance() != nullptr);
 
   aura::Window* container =
       keyboard::KeyboardController::GetInstance()->GetContainerWindow();
   DCHECK(container != nullptr);
 
   const display::Screen* screen = display::Screen::GetScreen();
   const display::Display current_display =
       screen->GetDisplayNearestWindow(container);
 
-  if (WmShell::Get()->GetFocusedWindow() != nullptr) {
+  if (wm::GetFocusedWindow() != nullptr) {
     // Move the virtual keyboard to the focused display if that display has
     // touch capability or keyboard is locked
     const display::Display focused_display =
-        WmShell::Get()->GetFocusedWindow()->GetDisplayNearestWindow();
+        WmWindow::Get(wm::GetFocusedWindow())->GetDisplayNearestWindow();
     if (current_display.id() != focused_display.id() &&
         focused_display.id() != display::kInvalidDisplayId &&
         focused_display.touch_support() ==
             display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE) {
       MoveKeyboardToDisplayInternal(focused_display.id());
       return;
     }
   }
 
   if (current_display.touch_support() !=
@@ skipping 53 matching lines @@
   if (is_enabled == was_enabled)
     return;
   if (is_enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash