| Index: ash/root_window_controller_unittest.cc
|
| diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
|
| index b29ccffd7777e29374cb21effc9d2b19d287bd7d..8c5c516dc44a79569039a5534e57989c503917a5 100644
|
| --- a/ash/root_window_controller_unittest.cc
|
| +++ b/ash/root_window_controller_unittest.cc
|
| @@ -744,15 +744,14 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {
|
| aura::Window* keyboard_window = controller->proxy()->GetKeyboardWindow();
|
| keyboard_container->AddChild(keyboard_window);
|
| keyboard_window->set_owned_by_parent(false);
|
| - keyboard_window->SetBounds(keyboard::KeyboardBoundsFromWindowBounds(
|
| - keyboard_container->bounds(), 100));
|
| + keyboard_window->SetBounds(keyboard::FullWidthKeyboardBoundsFromRootBounds(
|
| + root_window->bounds(), 100));
|
| keyboard_window->Show();
|
|
|
| gfx::Rect before = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
|
|
|
| // Notify keyboard bounds changing.
|
| - controller->NotifyKeyboardBoundsChanging(
|
| - controller->proxy()->GetKeyboardWindow()->bounds());
|
| + controller->NotifyKeyboardBoundsChanging(keyboard_container->bounds());
|
|
|
| if (!keyboard::IsKeyboardOverscrollEnabled()) {
|
| gfx::Rect after = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
|
| @@ -777,8 +776,8 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ClickWithActiveModalDialog) {
|
| proxy()->GetKeyboardWindow();
|
| keyboard_container->AddChild(keyboard_window);
|
| keyboard_window->set_owned_by_parent(false);
|
| - keyboard_window->SetBounds(keyboard::KeyboardBoundsFromWindowBounds(
|
| - keyboard_container->bounds(), 100));
|
| + keyboard_window->SetBounds(keyboard::FullWidthKeyboardBoundsFromRootBounds(
|
| + root_window->bounds(), 100));
|
|
|
| ui::test::TestEventHandler handler;
|
| root_window->AddPreTargetHandler(&handler);
|
| @@ -833,13 +832,13 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, EnsureCaretInWorkArea) {
|
| aura::Window* keyboard_window =proxy->GetKeyboardWindow();
|
| keyboard_container->AddChild(keyboard_window);
|
| keyboard_window->set_owned_by_parent(false);
|
| - keyboard_window->SetBounds(keyboard::KeyboardBoundsFromWindowBounds(
|
| - keyboard_container->bounds(), keyboard_height));
|
| + keyboard_window->SetBounds(keyboard::FullWidthKeyboardBoundsFromRootBounds(
|
| + root_window->bounds(), keyboard_height));
|
|
|
| proxy->EnsureCaretInWorkArea();
|
| - ASSERT_EQ(keyboard_container->bounds().width(),
|
| + ASSERT_EQ(root_window->bounds().width(),
|
| text_input_client.visible_rect().width());
|
| - ASSERT_EQ(keyboard_container->bounds().height() - keyboard_height,
|
| + ASSERT_EQ(root_window->bounds().height() - keyboard_height,
|
| text_input_client.visible_rect().height());
|
|
|
| if (switches::IsTextInputFocusManagerEnabled()) {
|
| @@ -869,8 +868,8 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ZOrderTest) {
|
| aura::Window* keyboard_window = proxy->GetKeyboardWindow();
|
| keyboard_container->AddChild(keyboard_window);
|
| keyboard_window->set_owned_by_parent(false);
|
| - gfx::Rect keyboard_bounds = keyboard::KeyboardBoundsFromWindowBounds(
|
| - keyboard_container->bounds(), keyboard_height);
|
| + gfx::Rect keyboard_bounds = keyboard::FullWidthKeyboardBoundsFromRootBounds(
|
| + root_window->bounds(), keyboard_height);
|
| keyboard_window->SetBounds(keyboard_bounds);
|
| keyboard_window->Show();
|
|
|
| @@ -952,11 +951,15 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, MAYBE_DisplayRotation) {
|
| aura::Window* keyboard_container =
|
| Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);
|
| ASSERT_TRUE(keyboard_container);
|
| - keyboard_container->Show();
|
| - EXPECT_EQ("0,0 800x600", keyboard_container->bounds().ToString());
|
| + keyboard::KeyboardController* keyboard_controller =
|
| + keyboard::KeyboardController::GetInstance();
|
| + keyboard_controller->ShowKeyboard(false);
|
| + keyboard_controller->proxy()->GetKeyboardWindow()->SetBounds(
|
| + gfx::Rect(0, 400, 800, 200));
|
| + EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString());
|
|
|
| UpdateDisplay("600x800");
|
| - EXPECT_EQ("0,0 600x800", keyboard_container->bounds().ToString());
|
| + EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString());
|
| }
|
|
|
| } // namespace test
|
|
|