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

Unified Diff: ui/gfx/image/image.h

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 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/compositor/test/test_compositor_host_linux.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image.h
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index 3c2c05d4b873743d62c87c4ee695d2156332cd0c..1878f49941c9ada5b7e3f930e6e165f575ddab57 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -38,7 +38,7 @@ class ImageMacTest;
namespace gfx {
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
class CairoCachedSurface;
#endif
@@ -73,7 +73,7 @@ class UI_EXPORT Image {
// of bitmaps, one for each resolution.
explicit Image(const std::vector<const SkBitmap*>& bitmaps);
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
// Does not increase |pixbuf|'s reference count; expects to take ownership.
explicit Image(GdkPixbuf* pixbuf);
#elif defined(OS_MACOSX)
@@ -97,7 +97,7 @@ class UI_EXPORT Image {
// The returned result is a weak pointer owned by and scoped to the life of
// the Image.
const SkBitmap* ToSkBitmap() const;
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
GdkPixbuf* ToGdkPixbuf() const;
CairoCachedSurface* const ToCairo() const;
#elif defined(OS_MACOSX)
@@ -111,7 +111,7 @@ class UI_EXPORT Image {
// converted representations, rather than a limitation imposed by Image) and
// so the result should be considered immutable.
SkBitmap* CopySkBitmap() const;
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
GdkPixbuf* CopyGdkPixbuf() const;
#elif defined(OS_MACOSX)
NSImage* CopyNSImage() const;
« no previous file with comments | « ui/gfx/compositor/test/test_compositor_host_linux.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698