Unix ifdefs patch for ui/ and webkit/

ui/gfx/image.h

 // Copyright (c) 2011 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 40 matching lines @@
   typedef std::map<RepresentationType, internal::ImageRep*> RepresentationMap;
 
   // Creates a new image with the default representation. The object will take
   // ownership of the image.
   explicit Image(const SkBitmap* bitmap);
 
   // To create an Image that supports multiple resolutions pass a vector
   // of bitmaps, one for each resolution.
   explicit Image(const std::vector<const SkBitmap*>& bitmaps);
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
   // Does not increase |pixbuf|'s reference count; expects to take ownership.
   explicit Image(GdkPixbuf* pixbuf);
 #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.
   Image(const Image& other);
 
   // Copies a reference to |other|'s storage.
   Image& operator=(const Image& other);
 
   // Deletes the image and, if the only owner of the storage, all of its cached
   // representations.
   ~Image();
 
   // Conversion handlers.
   operator const SkBitmap*() const ;
   operator const SkBitmap&() const;
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
   operator GdkPixbuf*() const;
 #elif defined(OS_MACOSX)
   operator NSImage*() const;
 #endif
 
   // Gets the number of bitmaps in this image. This may cause a conversion
   // to a bitmap representation. Note, this function and GetSkBitmapAtIndex()
   // are primarily meant to be used by the theme provider.
   size_t GetNumberOfSkBitmaps() const;
 
@@ skipping 26 matching lines @@
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 
   friend class ::ImageTest;
   friend class ::ImageMacTest;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_H_