Get rid of implicit conversion to and from ImageSkiaRep

ui/gfx/image/image_skia.cc

 // 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.
 
 #include "ui/gfx/image/image_skia.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 123 matching lines @@
 
 ImageSkia::ImageSkia() : storage_(NULL) {
 }
 
 ImageSkia::ImageSkia(ImageSkiaSource* source, const gfx::Size& size)
     : storage_(new internal::ImageSkiaStorage(source, size)) {
   DCHECK(source);
 }
 
 ImageSkia::ImageSkia(const SkBitmap& bitmap) {
-  Init(ImageSkiaRep(bitmap));
+  Init(ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
 }
 
 ImageSkia::ImageSkia(const ImageSkiaRep& image_rep) {
   Init(image_rep);
 }
 
 ImageSkia::ImageSkia(const ImageSkia& other) : storage_(other.storage_) {
 }
 
 ImageSkia& ImageSkia::operator=(const ImageSkia& other) {
   storage_ = other.storage_;
   return *this;
 }
 
 ImageSkia& ImageSkia::operator=(const SkBitmap& other) {
-  Init(ImageSkiaRep(other));
+  Init(ImageSkiaRep(other, ui::SCALE_FACTOR_100P));
   return *this;
 }
 
-ImageSkia& ImageSkia::operator=(const ImageSkiaRep& other) {
-  Init(other);
-  return *this;
-}
-
 ImageSkia::operator SkBitmap&() const {
   if (isNull())
     return const_cast<SkBitmap&>(NullImageRep().sk_bitmap());
 
   return const_cast<SkBitmap&>(storage_->image_reps()[0].sk_bitmap());
 }
 
-ImageSkia::operator ImageSkiaRep&() const {
-  if (isNull())
-    return NullImageRep();
-
-  return storage_->image_reps()[0];
-}
-
 ImageSkia::~ImageSkia() {
 }
 
 void ImageSkia::AddRepresentation(const ImageSkiaRep& image_rep) {
   DCHECK(!image_rep.is_null());
 
   if (isNull())
     Init(image_rep);
   else
     storage_->image_reps().push_back(image_rep);
@@ skipping 97 matching lines @@
   if (image_rep.sk_bitmap().empty()) {
     storage_ = NULL;
     return;
   }
   storage_ = new internal::ImageSkiaStorage(
       NULL, gfx::Size(image_rep.GetWidth(), image_rep.GetHeight()));
   storage_->image_reps().push_back(image_rep);
 }
 
 }  // namespace gfx