ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc - Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common

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

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window

Patch Set: merge 2 trunk Created 4 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

« ash/system/status_area_widget_delegate.cc ('K') | « ash/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | ash/wm/aura/wm_shelf_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 6086e49973ff32f071435c29bad7657a97b64613..bff868df96b077da26cea3c408da88d8959067c6 100644

--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

@@ -120,18 +120,16 @@ TEST_F(AshPopupAlignmentDelegateTest, MAYBE_ShelfAlignment) {

EXPECT_FALSE(alignment_delegate()->IsTopDown());

EXPECT_FALSE(alignment_delegate()->IsFromLeft());

- Shell::GetInstance()->SetShelfAlignment(

- SHELF_ALIGNMENT_RIGHT,

- Shell::GetPrimaryRootWindow());

+ Shell::GetInstance()->SetShelfAlignment(wm::SHELF_ALIGNMENT_RIGHT,

+ Shell::GetPrimaryRootWindow());

toast_point.set_x(alignment_delegate()->GetToastOriginX(toast_size));

toast_point.set_y(alignment_delegate()->GetBaseLine());

EXPECT_EQ(BOTTOM_RIGHT, GetPositionInDisplay(toast_point));

EXPECT_FALSE(alignment_delegate()->IsTopDown());

EXPECT_FALSE(alignment_delegate()->IsFromLeft());

- Shell::GetInstance()->SetShelfAlignment(

- SHELF_ALIGNMENT_LEFT,

- Shell::GetPrimaryRootWindow());

+ Shell::GetInstance()->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,

+ Shell::GetPrimaryRootWindow());

toast_point.set_x(alignment_delegate()->GetToastOriginX(toast_size));

toast_point.set_y(alignment_delegate()->GetBaseLine());

EXPECT_EQ(BOTTOM_LEFT, GetPositionInDisplay(toast_point));

@@ -145,9 +143,8 @@ TEST_F(AshPopupAlignmentDelegateTest, LockScreen) {

const gfx::Rect toast_size(0, 0, 10, 10);

- Shell::GetInstance()->SetShelfAlignment(

- SHELF_ALIGNMENT_LEFT,

- Shell::GetPrimaryRootWindow());

+ Shell::GetInstance()->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,

+ Shell::GetPrimaryRootWindow());

gfx::Point toast_point;

toast_point.set_x(alignment_delegate()->GetToastOriginX(toast_size));

toast_point.set_y(alignment_delegate()->GetBaseLine());

@@ -200,9 +197,9 @@ TEST_F(AshPopupAlignmentDelegateTest, DockedWindow) {

EXPECT_FALSE(alignment_delegate()->IsFromLeft());

// Force dock to right-side

- Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_LEFT,

+ Shell::GetInstance()->SetShelfAlignment(wm::SHELF_ALIGNMENT_LEFT,

Shell::GetPrimaryRootWindow());

- Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM,

+ Shell::GetInstance()->SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM,

Shell::GetPrimaryRootWindow());

// Right-side dock should not affect popup alignment