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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 240443006: Remove native VK window height logic and wait for resizeTo to setup VK window height (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests 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 69aad6b7d4f9f9b1520813933fdf2611e598bb62..033adc7784483114c43f348e6f77eb0611dd9131 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -702,6 +702,12 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {
aura::Window* keyboard_window = controller->proxy()->GetKeyboardWindow();
keyboard_container->AddChild(keyboard_window);
keyboard_window->set_owned_by_parent(false);
+ gfx::Rect window_bounds = keyboard_container->bounds();
+ keyboard_window->SetBounds(gfx::Rect(
+ window_bounds.x(),
+ window_bounds.y() + window_bounds.height() - 100,
+ window_bounds.width(),
+ 100));
keyboard_window->Show();
gfx::Rect before = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
@@ -731,7 +737,12 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ClickWithActiveModalDialog) {
proxy()->GetKeyboardWindow();
keyboard_container->AddChild(keyboard_window);
keyboard_window->set_owned_by_parent(false);
- keyboard_window->SetBounds(gfx::Rect());
+ gfx::Rect window_bounds = keyboard_container->bounds();
+ keyboard_window->SetBounds(gfx::Rect(
+ window_bounds.x(),
+ window_bounds.y() + window_bounds.height() - 100,
+ window_bounds.width(),
+ 100));
keyboard_window->Show();
ui::test::TestEventHandler* handler = new ui::test::TestEventHandler;

Powered by Google App Engine
This is Rietveld 408576698