ash/root_window_controller_unittest.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_unittest.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:

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

Download patch

Index: ash/root_window_controller_unittest.cc

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

index 659423aae88ece1726f594003746de0d1b6bf563..b4fe9f57c08ebce0f9bc457778f0614be2385a4f 100644

--- a/ash/root_window_controller_unittest.cc

+++ b/ash/root_window_controller_unittest.cc

@@ -622,7 +622,7 @@ class VirtualKeyboardRootWindowControllerTest : public RootWindowControllerTest

keyboard::switches::kEnableVirtualKeyboard);

test::AshTestBase::SetUp();

Shell::GetPrimaryRootWindowController()->ActivateKeyboard(

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

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

}

private:

@@ -660,7 +660,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,

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 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {

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 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ClickWithActiveModalDialog) {

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);

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