ash/virtual_keyboard_controller.cc - Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/virtual_keyboard_controller.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)

Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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() ==

« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | ash/wallpaper/wallpaper_controller.cc » ('j') | no next file with comments »