ui/gfx/image_unittest_util.h - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

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: ui/gfx/image_unittest_util.h

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 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: ui/gfx/image_unittest_util.h

diff --git a/ui/gfx/image_unittest_util.h b/ui/gfx/image_unittest_util.h

index f087f90cb0aa8e24a493142cbd2022d5cf898494..b85c4a46598901df7a05d0c30d66c6cf358354a6 100644

--- a/ui/gfx/image_unittest_util.h

+++ b/ui/gfx/image_unittest_util.h

@@ -15,7 +15,7 @@ namespace test {

#if defined(OS_MACOSX)

typedef NSImage* PlatformImage;

-#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)

+#elif defined(TOOLKIT_GTK)

Robert Sesek 2011/05/24 16:24:12 TOOLKIT_USES_GTK?

typedef GdkPixbuf* PlatformImage;

#else

typedef const SkBitmap* PlatformImage;