ash/virtual_keyboard_controller.cc - Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell

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 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: order Created 4 years, 6 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 c4b16cc594bd698932e97be2c4f141b2fb26cb49..244cf7f332ff621d040b92483f699d95fc3ac6f6 100644

--- a/ash/virtual_keyboard_controller.cc

+++ b/ash/virtual_keyboard_controller.cc

@@ -103,12 +103,12 @@ void VirtualKeyboardController::UpdateDevices() {

void VirtualKeyboardController::UpdateKeyboardEnabled() {

if (!IsSmartVirtualKeyboardEnabled()) {

- SetKeyboardEnabled(Shell::GetInstance()

+ SetKeyboardEnabled(WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled());

return;

}

- bool ignore_internal_keyboard = Shell::GetInstance()

+ bool ignore_internal_keyboard = WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled();

bool is_internal_keyboard_active =