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

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

index ba530d9cbb16067b8c1ab4d3236d0e3b9572eea3..4b8f423850673af6f26df9b20521449e0ec141af 100644

--- a/ui/gfx/native_widget_types.h

+++ b/ui/gfx/native_widget_types.h

@@ -97,7 +97,7 @@ typedef GdkRegion* NativeRegion;

#if defined(OS_MACOSX)

typedef NSImage NativeImageType;

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

+#elif defined(TOOLKIT_GTK)

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

typedef GdkPixbuf NativeImageType;

#else

typedef SkBitmap NativeImageType;