chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.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: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.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: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

index 62c95e741503bbb71052ca11532b486bdfafd0ab..b1f8062228142b437ce4c40c09fc0eacc3d0c11f 100644

--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

@@ -18,6 +18,7 @@

#include "ui/gfx/screen.h"

#include "ui/gfx/screen_type_delegate.h"

#include "ui/keyboard/keyboard.h"

+#include "ui/keyboard/keyboard_controller.h"

#include "ui/keyboard/keyboard_util.h"

#if defined(OS_CHROMEOS)

@@ -97,7 +98,7 @@ void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {

// activation to UpdateWindow() in virtual_keyboard_window_controller.cc.

if (!keyboard::IsKeyboardUsabilityExperimentEnabled()) {

ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard(

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

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

}