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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f7728b2b3a8d1c15ae1a29f9fa4d6070efd1a989..1e27c700cf40444ed82870f18bdb12b7b47efc49 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -151,34 +151,6 @@ TEST_F(AshPopupAlignmentDelegateTest, AutoHide) {
EXPECT_LT(baseline, alignment_delegate()->GetBaseLine());
}
-// Verify that docked window doesn't affect the popup alignment.
-TEST_F(AshPopupAlignmentDelegateTest, DockedWindow) {
- const gfx::Rect toast_size(0, 0, 10, 10);
- UpdateDisplay("600x600");
- int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
- int baseline = alignment_delegate()->GetBaseLine();
-
- std::unique_ptr<views::Widget> widget = CreateTestWidget(
- nullptr, kShellWindowId_DockedContainer, gfx::Rect(0, 0, 50, 50));
-
- // Left-side dock should not affect popup alignment
- EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
- EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
- EXPECT_FALSE(alignment_delegate()->IsTopDown());
- EXPECT_FALSE(alignment_delegate()->IsFromLeft());
-
- // Force dock to right-side
- WmShelf* shelf = GetPrimaryShelf();
- shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
- shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
-
- // Right-side dock should not affect popup alignment
- EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
- EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
- EXPECT_FALSE(alignment_delegate()->IsTopDown());
- EXPECT_FALSE(alignment_delegate()->IsFromLeft());
-}
-
TEST_F(AshPopupAlignmentDelegateTest, DisplayResize) {
const gfx::Rect toast_size(0, 0, 10, 10);
UpdateDisplay("600x600");
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698