ash/dip_unittest.cc - Issue 12313118: Refactor: Shelf Widget

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 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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 1df1ec72bd9c67c78d591c690c23fb513368289f..b31bce84bbbef2e6d58ebe44909f85a10e0e179d 100644

--- a/ash/dip_unittest.cc

+++ b/ash/dip_unittest.cc

@@ -6,6 +6,7 @@

#include <vector>

#include "ash/launcher/launcher.h"

+#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/wm/window_properties.h"

@@ -59,7 +60,7 @@ TEST_F(DIPTest, WorkArea) {

Launcher* launcher = Launcher::ForPrimaryDisplay();

EXPECT_EQ(

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

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

+ launcher->shelf_widget()->GetNativeView()->layer()->bounds().height());

}

} // namespace ash