status_icons: Update StatusTray/StatusIcon to use ImageSkia.

StatusTray/StatusIcon (in chrome/browser/status_icons) needs to use ImageSkia
instead of SkBitmap.

Note: These are not used on mac or chromeos (these are different from the ash
status-tray stuff).

BUG=143104
R=pkotwicz@chromium.org,atwilson@chromium.org
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/11032024

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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/status_icons/status_icon_unittest.cc b/chrome/browser/status_icons/status_icon_unittest.cc
index 8bb038a..8078665 100644
--- a/chrome/browser/status_icons/status_icon_unittest.cc
+++ b/chrome/browser/status_icons/status_icon_unittest.cc
@@ -18,11 +18,11 @@ class MockStatusIconObserver : public StatusIconObserver {
 class TestStatusIcon : public StatusIcon {
  public:
   TestStatusIcon() {}
-  virtual void SetImage(const SkBitmap& image) OVERRIDE {}
-  virtual void SetPressedImage(const SkBitmap& image) OVERRIDE {}
+  virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {}
+  virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE {}
   virtual void SetToolTip(const string16& tool_tip) OVERRIDE {}
   virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE {}
-  virtual void DisplayBalloon(const SkBitmap& icon,
+  virtual void DisplayBalloon(const gfx::ImageSkia& icon,
                               const string16& title,
                               const string16& contents) OVERRIDE {}
 };