ash/shelf/shelf_widget_unittest.cc - Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_widget_unittest.cc

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 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/shelf/shelf_widget_unittest.cc

diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc

index 56799af58bffe12f4c802b4c1ee51980393ed18b..403cc204a5b1d26c03429f781032ba1593f549f2 100644

--- a/ash/shelf/shelf_widget_unittest.cc

+++ b/ash/shelf/shelf_widget_unittest.cc

@@ -42,7 +42,7 @@ typedef test::AshTestBase ShelfWidgetTest;

void TestLauncherAlignment(aura::Window* root,

wm::ShelfAlignment alignment,

const std::string& expected) {

- Shell::GetInstance()->SetShelfAlignment(alignment, root);

+ Shelf::ForWindow(root)->SetAlignment(alignment);

display::Screen* screen = display::Screen::GetScreen();

EXPECT_EQ(expected,

screen->GetDisplayNearestWindow(root).work_area().ToString());

@@ -55,9 +55,7 @@ void TestLauncherAlignment(aura::Window* root,

#define MAYBE_TestAlignment TestAlignment

#endif

TEST_F(ShelfWidgetTest, MAYBE_TestAlignment) {

- Shelf* shelf = Shelf::ForPrimaryDisplay();

UpdateDisplay("400x400");

- ASSERT_TRUE(shelf);

{

SCOPED_TRACE("Single Bottom");

TestLauncherAlignment(Shell::GetPrimaryRootWindow(),

« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.h » ('j') | no next file with comments »