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

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

index df088feae9f95ef95f966b4cdfc35a568078ede8..d9117ed9aa1b10177eee7de81cf629283bd72ac3 100644

--- a/ui/gfx/image.h

+++ b/ui/gfx/image.h

@@ -58,7 +58,7 @@ class Image {

// of bitmaps, one for each resolution.

explicit Image(const std::vector<const SkBitmap*>& bitmaps);

-#if defined(OS_LINUX)

+#if defined(TOOLKIT_USES_GTK)

// Does not increase |pixbuf|'s reference count; expects to take ownership.

explicit Image(GdkPixbuf* pixbuf);

#elif defined(OS_MACOSX)

@@ -81,7 +81,7 @@ class Image {

// Conversion handlers.

operator const SkBitmap*() const ;

operator const SkBitmap&() const;

-#if defined(OS_LINUX)

+#if defined(TOOLKIT_USES_GTK)

operator GdkPixbuf*() const;

#elif defined(OS_MACOSX)

operator NSImage*() const;