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

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

index ebcd3b810bfb68194ffc3089b504fcdfeef982b0..d4878b647d1b9b3ae510e46c37c4e000c09a87e0 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -450,7 +450,7 @@ void RootWindowController::CloseChildWindows() {

// Deactivate keyboard container before closing child windows and shutting

// down associated layout managers.

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

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

// panel_layout_manager_ needs to be shut down before windows are destroyed.

if (panel_layout_manager_) {