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

Unified Diff: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WindowManager WmShell::Shutdown; delay PointerWatcherEventRouter teardown; cleanup shutdown wor… Created 4 years, 4 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/system/web_notification/ash_popup_alignment_delegate_unittest.cc
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
index e379c3e52694e73b78c8c85465d2c77b0f503099..dbec4d729b42cdc825f84e40becd3d7194332e18 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -304,12 +304,12 @@ TEST_F(AshPopupAlignmentDelegateTest, MAYBE_KeyboardShowing) {
WmShelf* shelf = GetPrimaryShelf();
gfx::Rect keyboard_bounds(0, 300, 600, 300);
- shelf->SetKeyboardBoundsForTesting(keyboard_bounds);
+ shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds);
int keyboard_baseline = alignment_delegate()->GetBaseLine();
EXPECT_NE(baseline, keyboard_baseline);
EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
- shelf->SetKeyboardBoundsForTesting(gfx::Rect());
+ shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect());
EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
}

Powered by Google App Engine
This is Rietveld 408576698