image-skia: Remove implicit conversion to SkBitmap on linux and chromeos.

ui/gfx/image/image_skia.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.
 
 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_H_
 #define UI_GFX_IMAGE_IMAGE_SKIA_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 42 matching lines @@
   // Copies a reference to |other|'s storage.
   ImageSkia& operator=(const ImageSkia& other);
 
   // Converts from SkBitmap.
   // Adds ref to passed in bitmap.
   // DIP width and height are set based on scale factor of 1x.
   // TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is
   // done.
   ImageSkia& operator=(const SkBitmap& other);
 
+#if defined(OS_MACOSX) || defined(OS_WIN)
   // Converts to gfx::ImageSkiaRep and SkBitmap.
   // TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is
   // done.
-  operator SkBitmap&() const;
+  operator SkBitmap&() const { return GetBitmap(); }
+#endif
 
   ~ImageSkia();
 
   // Returns true if this object is backed by the same ImageSkiaStorage as
   // |other|. Will also return true if both images are isNull().
   bool BackedBySameObjectAs(const gfx::ImageSkia& other) const;
 
   // Adds |image_rep| to the image reps contained by this object.
   void AddRepresentation(const gfx::ImageSkiaRep& image_rep);
 
@@ skipping 33 matching lines @@
   // Wrapper function for SkBitmap::extractBitmap.
   // Deprecated, use ImageSkiaOperations::ExtractSubset instead.
   // TODO(pkotwicz): Remove this function.
   bool extractSubset(ImageSkia* dst, const SkIRect& subset) const;
 
   // Returns pointer to 1x bitmap contained by this object. If there is no 1x
   // bitmap, the bitmap whose scale factor is closest to 1x is returned.
   // This function should only be used in unittests and on platforms which do
   // not support scale factors other than 1x.
   // TODO(pkotwicz): Return null SkBitmap when the object has no 1x bitmap.
-  const SkBitmap* bitmap() const { return &operator SkBitmap&(); }
+  const SkBitmap* bitmap() const { return &GetBitmap(); }
 
   // Returns a vector with the image reps contained in this object.
   // There is no guarantee that this will return all images rep for
   // supported scale factors.
   // TODO(oshima): Update all use of this API and make this to fail
   // when source is used.
   std::vector<gfx::ImageSkiaRep> image_reps() const;
 
  private:
   // Initialize ImageSkiaStorage with passed in parameters.
   // If the image rep's bitmap is empty, ImageStorage is set to NULL.
   void Init(const gfx::ImageSkiaRep& image_rep);
 
+  SkBitmap& GetBitmap() const;
+
   // A refptr so that ImageRepSkia can be copied cheaply.
   scoped_refptr<internal::ImageSkiaStorage> storage_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_SKIA_H_