| Index: ash/virtual_keyboard_controller.cc
|
| diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc
|
| index 2d1443c945c7fb20385958a55ac0c811cc265940..b49c60af702c20294f0828673cb8ef123b2aa27a 100644
|
| --- a/ash/virtual_keyboard_controller.cc
|
| +++ b/ash/virtual_keyboard_controller.cc
|
| @@ -12,7 +12,6 @@
|
| #include "ash/system/tray/system_tray_notifier.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "ash/wm/window_util.h"
|
| -#include "ash/wm_window.h"
|
| #include "base/command_line.h"
|
| #include "base/strings/string_util.h"
|
| #include "ui/display/display.h"
|
| @@ -138,7 +137,8 @@ void VirtualKeyboardController::MoveKeyboardToTouchableDisplay() {
|
| // Move the virtual keyboard to the focused display if that display has
|
| // touch capability or keyboard is locked
|
| const display::Display focused_display =
|
| - WmWindow::Get(wm::GetFocusedWindow())->GetDisplayNearestWindow();
|
| + display::Screen::GetScreen()->GetDisplayNearestWindow(
|
| + wm::GetFocusedWindow());
|
| if (current_display.id() != focused_display.id() &&
|
| focused_display.id() != display::kInvalidDisplayId &&
|
| focused_display.touch_support() ==
|
|
|