More removal of GTK code.

ui/gfx/image/image.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // An Image wraps an image any flavor, be it platform-native GdkBitmap/NSImage,
 // or a SkBitmap. This also provides easy conversion to other image types
 // through operator overloading. It will cache the converted representations
 // internally to prevent double-conversion.
 //
 // The lifetime of both the initial representation and any converted ones are
@@ skipping 26 matching lines @@
 namespace {
 class ImageTest;
 class ImageMacTest;
 }
 
 namespace gfx {
 struct ImagePNGRep;
 class ImageSkia;
 class Size;
 
-#if defined(TOOLKIT_GTK)
-class CairoCachedSurface;
-#endif
-
 namespace internal {
 class ImageRep;
 class ImageStorage;
 }
 
 class GFX_EXPORT Image {
  public:
   enum RepresentationType {
     kImageRepGdk,
     kImageRepCocoa,
     kImageRepCocoaTouch,
     kImageRepCairo,
     kImageRepSkia,
     kImageRepPNG,
   };
 
   typedef std::map<RepresentationType, internal::ImageRep*> RepresentationMap;
 
   // Creates an empty image with no representations.
   Image();
 
   // Creates a new image by copying the raw PNG-encoded input for use as the
   // default representation.
   explicit Image(const std::vector<ImagePNGRep>& image_reps);
 
   // Creates a new image by copying the ImageSkia for use as the default
   // 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)
   // Does not retain |image|; expects to take ownership.
   // A single NSImage object can contain multiple bitmaps so there's no reason
   // to pass a vector of these.
   explicit Image(NSImage* image);
 #endif
 
   // Initializes a new Image by AddRef()ing |other|'s internal storage.
@@ skipping 21 matching lines @@
 
   // Creates an image from the PNG encoded input.
   static Image CreateFrom1xPNGBytes(
       const scoped_refptr<base::RefCountedMemory>& input);
 
   // Converts the Image to the desired representation and stores it internally.
   // The returned result is a weak pointer owned by and scoped to the life of
   // 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;
 #endif
 
   // Returns the raw PNG-encoded data for the bitmap at 1x. If the data is
   // unavailable, either because the image has no data for 1x or because it is
   // empty, an empty RefCountedBytes object is returned. NULL is never
   // returned.
   scoped_refptr<base::RefCountedMemory> As1xPNGBytes() const;
@@ skipping 12 matching lines @@
 
   // Performs a conversion, like above, but returns a copy of the result rather
   // than a weak pointer. The caller is responsible for deleting the result.
   // Note that the result is only a copy in terms of memory management; the
   // backing pixels are shared amongst all copies (a fact of each of the
   // converted representations, rather than a limitation imposed by Image) and
   // so the result should be considered immutable.
   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;
 #endif
 
   // Inspects the representations map to see if the given type exists.
   bool HasRepresentation(RepresentationType type) const;
 
   // Returns the number of representations.
   size_t RepresentationCount() const;
@@ skipping 32 matching lines @@
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 
   friend class ::ImageTest;
   friend class ::ImageMacTest;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_H_