ash/display/virtual_keyboard_window_controller.cc - Issue 219503003: Make keyboard controller a singleton.

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/display/virtual_keyboard_window_controller.cc

Issue 219503003: Make keyboard controller a singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix root window controller unittets. Created 6 years, 8 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/display/virtual_keyboard_window_controller.cc

diff --git a/ash/display/virtual_keyboard_window_controller.cc b/ash/display/virtual_keyboard_window_controller.cc

index b7cb2621b9d56165ebe3d8b1ce4197283a48a2dd..58597b3a1324cd94a2aa331e5562435f2d0336b5 100644

--- a/ash/display/virtual_keyboard_window_controller.cc

+++ b/ash/display/virtual_keyboard_window_controller.cc

@@ -59,7 +59,7 @@ void VirtualKeyboardWindowController::UpdateWindow(

root_window_controller_.reset(GetRootWindowController(host->window()));

root_window_controller_->host()->Show();

root_window_controller_->ActivateKeyboard(

- Shell::GetInstance()->keyboard_controller());

+ keyboard::KeyboardController::GetInstance());

FlipDisplay();

} else {

aura::WindowTreeHost* host = root_window_controller_->host();

« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | no next file with comments »