Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1134)

Unified Diff: ash/root_window_controller_unittest.cc

Issue 2553603002: New accessibility virtual keyboard behavior in non-sticky mode. (Closed)
Patch Set: Remove unused variable Created 3 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
« no previous file with comments | « no previous file | ash/wm_window.cc » ('j') | ui/keyboard/keyboard_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index ce3611c8d7ea754a08cdcbf2208e7cc748b7d8b8..050be2bccf5137cdc8b680b2b2aab9b210a29947 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -1070,13 +1070,14 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, EnsureCaretInWorkArea) {
keyboard_window->set_owned_by_parent(false);
keyboard_window->SetBounds(keyboard::FullWidthKeyboardBoundsFromRootBounds(
root_window->bounds(), keyboard_height));
+ keyboard_window->Show();
ui->EnsureCaretInWorkArea();
ASSERT_EQ(root_window->bounds().width(),
text_input_client.caret_exclude_rect().width());
ASSERT_EQ(keyboard_height, text_input_client.caret_exclude_rect().height());
- input_method->SetFocusedTextInputClient(NULL);
+ input_method->SetFocusedTextInputClient(nullptr);
}
TEST_F(VirtualKeyboardRootWindowControllerTest,
@@ -1117,9 +1118,13 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,
keyboard_window->set_owned_by_parent(false);
keyboard_window->SetBounds(keyboard::FullWidthKeyboardBoundsFromRootBounds(
primary_root_window->bounds(), keyboard_height));
+ keyboard_window->Show();
+ ui->EnsureCaretInWorkArea();
EXPECT_TRUE(primary_root_window->GetBoundsInScreen().Contains(
text_input_client.caret_exclude_rect()));
+ EXPECT_EQ(primary_root_window->GetBoundsInScreen().width(),
+ text_input_client.caret_exclude_rect().width());
EXPECT_FALSE(secondary_root_window->GetBoundsInScreen().Contains(
text_input_client.caret_exclude_rect()));
@@ -1134,6 +1139,8 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,
text_input_client.caret_exclude_rect()));
EXPECT_TRUE(secondary_root_window->GetBoundsInScreen().Contains(
text_input_client.caret_exclude_rect()));
+ EXPECT_EQ(secondary_root_window->GetBoundsInScreen().width(),
+ text_input_client.caret_exclude_rect().width());
input_method->SetFocusedTextInputClient(nullptr);
}
« no previous file with comments | « no previous file | ash/wm_window.cc » ('j') | ui/keyboard/keyboard_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698