Make gfx::ImageSkia(gfx::ImageSkiaRep) explicit

BUG=None
Test=None

R=oshima
TBR=sky

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

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

5 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/profiles/profile_info_util.cc b/chrome/browser/profiles/profile_info_util.cc
index 27e3130..196e01d 100644
--- a/chrome/browser/profiles/profile_info_util.cc
+++ b/chrome/browser/profiles/profile_info_util.cc
@@ -33,7 +33,7 @@ gfx::Image GetAvatarIconForMenu(const gfx::Image& image,
   SkColor color = SkColorSetARGB(83, 0, 0, 0);
   canvas.DrawRect(gfx::Rect(x, y, length - 1, length - 1), color);
 
-  return gfx::Image(canvas.ExtractImageRep());
+  return gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep()));
 }
 
 gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
@@ -52,7 +52,7 @@ gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
   int y = (kAvatarIconHeight - length) / 2;
   canvas.DrawImageInt(bmp, x, y);
 
-  return gfx::Image(canvas.ExtractImageRep());
+  return gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep()));
 }
 
 gfx::Image GetAvatarIconForTitleBar(const gfx::Image& image,
@@ -91,7 +91,7 @@ gfx::Image GetAvatarIconForTitleBar(const gfx::Image& image,
   canvas.DrawLine(gfx::Point(x2 - 1, y1 + 1), gfx::Point(x2 - 1, y2 - 1),
                   shadow_color);
 
-  return gfx::Image(canvas.ExtractImageRep());
+  return gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep()));
 }
 
 } // namespace
diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc
index a761756..d7e8b39 100644
--- a/chrome/browser/ui/views/dropdown_bar_view.cc
+++ b/chrome/browser/ui/views/dropdown_bar_view.cc
@@ -117,8 +117,8 @@ void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
      canvas->Translate(bounds().origin());
      OnPaintBackground(&animating_edges);
      OnPaintBorder(&animating_edges);
-     canvas->DrawImageInt(animating_edges.ExtractImageRep(), bounds().x(),
-         animation_offset());
+     canvas->DrawImageInt(gfx::ImageSkia(animating_edges.ExtractImageRep()),
+         bounds().x(), animation_offset());
   }
 }
 
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 845bf6a..aaf35ab 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -742,7 +742,8 @@ void Tab::PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
-    hover_controller().Draw(canvas, background_canvas.ExtractImageRep());
+    hover_controller().Draw(canvas, gfx::ImageSkia(
+        background_canvas.ExtractImageRep()));
   }
 
   // Now draw the highlights/shadows around the tab edge.
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 9b79ab6..2dfc131 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -51,7 +51,7 @@ class UI_EXPORT ImageSkia {
   // done.
   ImageSkia(const SkBitmap& bitmap);
 
-  ImageSkia(const gfx::ImageSkiaRep& image_rep);
+  explicit ImageSkia(const gfx::ImageSkiaRep& image_rep);
 
   // Copies a reference to |other|'s storage.
   ImageSkia(const ImageSkia& other);
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 0ad95ae..1f4fd4c 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -456,7 +456,8 @@ TEST_F(ImageTest, OwnershipTest) {
   {
     SkBitmap bitmap(gt::CreateBitmap(10, 10));
     EXPECT_TRUE(!bitmap.isNull());
-    image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
+    image = gfx::Image(gfx::ImageSkia(
+        gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P)));
   }
   EXPECT_TRUE(!image.ToSkBitmap()->isNull());
 }