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

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

Issue 232773008: More removal of GTK code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove base/ so I don't need another stamp. Created 6 years, 8 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/cairo_cached_surface.cc ('k') | ui/gfx/platform_font_pango.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 68e7a23ee619429611da281b3a471304d27f7f80..6f0e9266e7b8a017f94ccda3e4e94fdc12960ec4 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -44,10 +44,6 @@ struct ImagePNGRep;
class ImageSkia;
class Size;
-#if defined(TOOLKIT_GTK)
-class CairoCachedSurface;
-#endif
-
namespace internal {
class ImageRep;
class ImageStorage;
@@ -77,10 +73,7 @@ class GFX_EXPORT Image {
// representation.
explicit Image(const ImageSkia& image);
-#if defined(TOOLKIT_GTK)
- // Does not increase |pixbuf|'s reference count; expects to take ownership.
- explicit Image(GdkPixbuf* pixbuf);
-#elif defined(OS_IOS)
+#if defined(OS_IOS)
// Does not retain |image|; expects to take ownership.
explicit Image(UIImage* image);
#elif defined(OS_MACOSX)
@@ -122,10 +115,7 @@ class GFX_EXPORT Image {
// the Image. Must only be called if IsEmpty() is false.
const SkBitmap* ToSkBitmap() const;
const ImageSkia* ToImageSkia() const;
-#if defined(TOOLKIT_GTK)
- GdkPixbuf* ToGdkPixbuf() const;
- CairoCachedSurface* const ToCairo() const;
-#elif defined(OS_IOS)
+#if defined(OS_IOS)
UIImage* ToUIImage() const;
#elif defined(OS_MACOSX)
NSImage* ToNSImage() const;
@@ -158,9 +148,7 @@ class GFX_EXPORT Image {
scoped_refptr<base::RefCountedMemory> Copy1xPNGBytes() const;
ImageSkia* CopyImageSkia() const;
SkBitmap* CopySkBitmap() const;
-#if defined(TOOLKIT_GTK)
- GdkPixbuf* CopyGdkPixbuf() const;
-#elif defined(OS_IOS)
+#if defined(OS_IOS)
UIImage* CopyUIImage() const;
#elif defined(OS_MACOSX)
NSImage* CopyNSImage() const;
« no previous file with comments | « ui/gfx/image/cairo_cached_surface.cc ('k') | ui/gfx/platform_font_pango.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698