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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 266513003: Reland enable VK overscroll by default. Fixed ash unittest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-enable flag. 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
« no previous file with comments | « no previous file | ui/keyboard/keyboard_util.cc » ('j') | no next file with comments »
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 803e07800cc4df25db5843db938d5ec979864b2c..3edd28013e160131fde6d374312f1c40f5da724c 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -714,8 +714,10 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, RestoreWorkspaceAfterLogin) {
controller->NotifyKeyboardBoundsChanging(
controller->proxy()->GetKeyboardWindow()->bounds());
- gfx::Rect after = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
- EXPECT_LT(after, before);
+ if (!keyboard::IsKeyboardOverscrollEnabled()) {
+ gfx::Rect after = ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
+ EXPECT_LT(after, before);
+ }
// Mock a login user profile change to reinitialize the keyboard.
ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
« no previous file with comments | « no previous file | ui/keyboard/keyboard_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698