ash/root_window_controller_unittest.cc - Issue 1008453002: Allow javascript change the virtual keyboard window size and position freely in FLOATING mode

Unified Diff: ash/root_window_controller_unittest.cc

Issue 1008453002: Allow javascript change the virtual keyboard window size and position freely in FLOATING mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 9 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 0c321df8e234b0fa1189100258c442f59680988b..ce88cf6aa5ad91cbe6fa8f02b1d864c6b31aa3e1 100644

--- a/ash/root_window_controller_unittest.cc

+++ b/ash/root_window_controller_unittest.cc

@@ -751,8 +751,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {

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

@@ -837,9 +836,9 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, EnsureCaretInWorkArea) {

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

sadrul 2015/03/20 17:32:16 Not sure what this test is checking anymore. Can y

bshe 2015/03/27 16:29:16 I think it is still testing the visible_rect of te

if (switches::IsTextInputFocusManagerEnabled()) {

@@ -952,11 +951,12 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, MAYBE_DisplayRotation) {

aura::Window* keyboard_container =

Shell::GetContainer(root_window, kShellWindowId_VirtualKeyboardContainer);

ASSERT_TRUE(keyboard_container);

+ keyboard::KeyboardController::GetInstance()->ShowKeyboard(false);

keyboard_container->Show();

- EXPECT_EQ("0,0 800x600", keyboard_container->bounds().ToString());

+ EXPECT_EQ("0,600 800x0", keyboard_container->bounds().ToString());

UpdateDisplay("600x800");

- EXPECT_EQ("0,0 600x800", keyboard_container->bounds().ToString());

+ EXPECT_EQ("0,800 600x0", keyboard_container->bounds().ToString());

sadrul 2015/03/20 17:32:17 Why the change in this test?

bshe 2015/03/27 16:29:16 After a screen rotation, we want to make sure that

}

} // namespace test

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/wm/always_on_top_controller_unittest.cc » ('j') | ui/keyboard/keyboard_layout_manager.cc » ('J')