Make keyboard controller a singleton.
BUG=358191
Review URL: https://codereview.chromium.org/219503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262177 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 659423a..b4fe9f57 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -622,7 +622,7 @@
keyboard::switches::kEnableVirtualKeyboard);
test::AshTestBase::SetUp();
Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
- Shell::GetInstance()->keyboard_controller());
+ keyboard::KeyboardController::GetInstance());
}
private:
@@ -660,7 +660,7 @@
ASSERT_TRUE(keyboard_container);
keyboard_container->Show();
- aura::Window* keyboard_window = Shell::GetInstance()->keyboard_controller()->
+ aura::Window* keyboard_window = keyboard::KeyboardController::GetInstance()->
proxy()->GetKeyboardWindow();
keyboard_container->AddChild(keyboard_window);
keyboard_window->set_owned_by_parent(false);
@@ -712,7 +712,7 @@
Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
keyboard_container->Show();
keyboard::KeyboardController* controller =
- Shell::GetInstance()->keyboard_controller();
+ keyboard::KeyboardController::GetInstance();
aura::Window* keyboard_window = controller->proxy()->GetKeyboardWindow();
keyboard_container->AddChild(keyboard_window);
keyboard_window->set_owned_by_parent(false);
@@ -741,7 +741,7 @@
ASSERT_TRUE(keyboard_container);
keyboard_container->Show();
- aura::Window* keyboard_window = Shell::GetInstance()->keyboard_controller()->
+ aura::Window* keyboard_window = keyboard::KeyboardController::GetInstance()->
proxy()->GetKeyboardWindow();
keyboard_container->AddChild(keyboard_window);
keyboard_window->set_owned_by_parent(false);
