ash/dip_unittest.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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/dip_unittest.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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/dip_unittest.cc

diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc

index 2a311d547f8b8cc53262d549bf897481ad967aee..8ac0adb52ac227dd19caa79abde9b29f052ae588 100644

--- a/ash/dip_unittest.cc

+++ b/ash/dip_unittest.cc

@@ -63,7 +63,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) {

// Sanity check if the workarea's inset hight is same as

// the launcher's height.

- Launcher* launcher = Shell::GetInstance()->launcher();

+ Launcher* launcher = Launcher::ForPrimaryDisplay();

EXPECT_EQ(

display_2x.bounds().InsetsFrom(work_area).height(),

launcher->widget()->GetNativeView()->layer()->bounds().height());