Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(898)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/image_unittest_util.cc ('k') | ui/views/events/accelerator.cc » ('j') | webkit/extensions/v8/profiler_extension.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
typedef GdkPixbuf NativeImageType;
#else
typedef SkBitmap NativeImageType;
« no previous file with comments | « ui/gfx/image_unittest_util.cc ('k') | ui/views/events/accelerator.cc » ('j') | webkit/extensions/v8/profiler_extension.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698