image: Remove operator for converting from SkBitmap to ImageSkia.

BUG=141146

Review URL: https://chromiumcodereview.appspot.com/10880063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153497 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 12 deletions

diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 65f2d48..f0b90a1 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -160,11 +160,6 @@ ImageSkia& ImageSkia::operator=(const ImageSkia& other) {
   return *this;
 }
 
-ImageSkia& ImageSkia::operator=(const SkBitmap& other) {
-  Init(ImageSkiaRep(other, ui::SCALE_FACTOR_100P));
-  return *this;
-}
-
 ImageSkia::~ImageSkia() {
 }
 
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 24422d2..2518b2c 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -53,13 +53,6 @@ class UI_EXPORT ImageSkia {
   // 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_WIN)
   // Converts to gfx::ImageSkiaRep and SkBitmap.
   // TODO(pkotwicz): This is temporary till conversion to gfx::ImageSkia is