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

ui/views/controls/image_view.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_VIEWS_CONTROLS_IMAGE_VIEW_H_
 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
 #pragma once
 
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 12 matching lines @@
     CENTER,
     TRAILING
   };
 
   ImageView();
   virtual ~ImageView();
 
   // Set the bitmap that should be displayed.
   void SetImage(const SkBitmap& bm);
 
-  // Set the bitmap that should be displayed from a pointer. Reset the image
+  // Set the image that should be displayed from a pointer. Reset the image
   // if the pointer is NULL. The pointer contents is copied in the receiver's
   // bitmap.
-  void SetImage(const SkBitmap* bm);
+  void SetImage(const gfx::ImageSkia* image_skia);
 
   // Returns the bitmap currently displayed or NULL of none is currently set.
   // The returned bitmap is still owned by the ImageView.
   const SkBitmap& GetImage();
 
   // Set the desired image size for the receiving ImageView.
   void SetImageSize(const gfx::Size& image_size);
 
   // Return the preferred size for the receiving view. Returns false if the
   // preferred size is not defined, which means that the view uses the image
@@ skipping 47 matching lines @@
 
   // The current tooltip text.
   string16 tooltip_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_