ash/shelf/shelf_widget_unittest.cc - Issue 2911393002: Nix GetRootWindowController, use RootWindowController::ForWindow.

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 2911393002: Nix GetRootWindowController, use RootWindowController::ForWindow. (Closed)

Patch Set: Sync and rebase. Created 3 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:

Index: ash/shelf/shelf_widget_unittest.cc

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

index 0b81b03ed191f6282c1d335a72fac9f542c8713f..98ff8ce0e4773f44f29ad5591c676db5bf740f3f 100644

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

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

@@ -37,7 +37,7 @@ ShelfLayoutManager* GetShelfLayoutManager() {

void TestLauncherAlignment(aura::Window* root,

ShelfAlignment alignment,

const gfx::Rect& expected) {

- GetRootWindowController(root)->shelf()->SetAlignment(alignment);

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

EXPECT_EQ(expected.ToString(), display::Screen::GetScreen()

->GetDisplayNearestWindow(root)

.work_area()