ash/root_window_controller.cc - Issue 2134833002: ash: Move VirtualKeyboardStateObserver functionality to ShellObserver

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/root_window_controller.cc

Issue 2134833002: ash: Move VirtualKeyboardStateObserver functionality to ShellObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments Created 4 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index 1ab4e46e5764c6fd3b91c26df18b340061f00cfc..38c33459e117bf6c5d55652f91d8fb66124d4233 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -703,7 +703,7 @@ void RootWindowController::ActivateKeyboard(

keyboard_controller->AddObserver(workspace_controller_->layout_manager());

keyboard_controller->AddObserver(

always_on_top_controller_->GetLayoutManager());

- WmShell::Get()->delegate()->VirtualKeyboardActivated(true);

+ WmShell::Get()->OnVirtualKeyboardActivated(true);

aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);

DCHECK(parent);

aura::Window* keyboard_container = keyboard_controller->GetContainerWindow();

@@ -733,7 +733,7 @@ void RootWindowController::DeactivateKeyboard(

workspace_controller_->layout_manager());

keyboard_controller->RemoveObserver(

always_on_top_controller_->GetLayoutManager());

- WmShell::Get()->delegate()->VirtualKeyboardActivated(false);

+ WmShell::Get()->OnVirtualKeyboardActivated(false);

}

« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »