Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ui/views/controls/image_view.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/views/controls/image_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 12 matching lines @@
 }
 
 void ImageView::SetImage(const SkBitmap& bm) {
   gfx::Size pref_size(GetPreferredSize());
   image_ = bm;
   if (pref_size != GetPreferredSize())
     PreferredSizeChanged();
   SchedulePaint();
 }
 
-void ImageView::SetImage(const SkBitmap* bm) {
-  if (bm) {
-    SetImage(*bm);
+void ImageView::SetImage(const gfx::ImageSkia* image_skia) {
+  if (image_skia) {
+    SetImage(*image_skia);
   } else {
     SkBitmap t;
     SetImage(t);
   }
 }
 
 const SkBitmap& ImageView::GetImage() {
   return image_;
 }
 
@@ skipping 121 matching lines @@
 
 bool ImageView::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
   *tooltip = GetTooltipText();
   return true;
 }
 
 }  // namespace views