ash/shelf/shelf_widget_unittest.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

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 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: First cut for review/trybots Created 7 years, 2 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 6004a6cccdfba8e17c353e844a4d5f8d69b8ca0f..010db18053f036465a798272e471023e13266064 100644

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

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

@@ -54,7 +54,7 @@ TEST_F(ShelfWidgetTest, DISABLED_ActivateAsFallback) {

EXPECT_FALSE(shelf_widget->CanActivate());

}

-void TestLauncherAlignment(aura::RootWindow* root,

+void TestLauncherAlignment(aura::Window* root,

ShelfAlignment alignment,

const std::string& expected) {

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