ash/wm/image_grid_unittest.cc - Issue 10221028: Move DIP translation from ui/aura to ui/compositor

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/wm/image_grid_unittest.cc

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: disable tests that doesn't run on bots Created 8 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/wm/image_grid_unittest.cc

diff --git a/ash/wm/image_grid_unittest.cc b/ash/wm/image_grid_unittest.cc

index bb31c31f236375d945e53327baae94506211bc2c..715ddb95054eae9c3ce85f49d10027319544cb80 100644

--- a/ash/wm/image_grid_unittest.cc

+++ b/ash/wm/image_grid_unittest.cc

@@ -37,7 +37,7 @@ TEST_F(ImageGridTest, Basic) {

scoped_ptr<gfx::Image> image_Bx1(CreateImage(gfx::Size(kBorder, 1)));

scoped_ptr<gfx::Image> image_BxB(CreateImage(gfx::Size(kBorder, kBorder)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(image_BxB.get(), image_1xB.get(), image_BxB.get(),

image_Bx1.get(), image_1x1.get(), image_Bx1.get(),

image_BxB.get(), image_1xB.get(), image_BxB.get());

@@ -129,7 +129,7 @@ TEST_F(ImageGridTest, SetContentBounds) {

scoped_ptr<gfx::Image> image_Bx1(CreateImage(gfx::Size(kBorder, 1)));

scoped_ptr<gfx::Image> image_BxB(CreateImage(gfx::Size(kBorder, kBorder)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(image_BxB.get(), image_1xB.get(), image_BxB.get(),

image_Bx1.get(), image_1x1.get(), image_Bx1.get(),

image_BxB.get(), image_1xB.get(), image_BxB.get());

@@ -154,7 +154,7 @@ TEST_F(ImageGridTest, SingleImage) {

const int kBorder = 1;

scoped_ptr<gfx::Image> image(CreateImage(gfx::Size(kBorder, kBorder)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(NULL, image.get(), NULL,

NULL, NULL, NULL,

NULL, NULL, NULL);

@@ -186,7 +186,7 @@ TEST_F(ImageGridTest, ResetImages) {

const int kBorder = 1;

scoped_ptr<gfx::Image> image(CreateImage(gfx::Size(kBorder, kBorder)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(NULL, image.get(), NULL,

NULL, NULL, NULL,

NULL, NULL, NULL);

@@ -234,7 +234,7 @@ TEST_F(ImageGridTest, SmallerSides) {

scoped_ptr<gfx::Image> left_image(CreateImage(gfx::Size(kEdge, kEdge)));

scoped_ptr<gfx::Image> right_image(CreateImage(gfx::Size(kEdge, kEdge)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(top_left_image.get(), top_image.get(), top_right_image.get(),

left_image.get(), NULL, right_image.get(),

NULL, NULL, NULL);

@@ -287,7 +287,7 @@ TEST_F(ImageGridTest, TooSmall) {

scoped_ptr<gfx::Image> bottom_right_image(

CreateImage(gfx::Size(kCorner, kCorner)));

- ImageGrid grid(NULL);

+ ImageGrid grid;

grid.SetImages(

top_left_image.get(), top_image.get(), top_right_image.get(),

left_image.get(), center_image.get(), right_image.get(),

« no previous file with comments | « ash/wm/image_grid.cc ('k') | ash/wm/resize_shadow.cc » ('j') | no next file with comments »