Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/toolbar_view.h

Index: chrome/browser/ui/views/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index d77f4e1f5ccdb8556f1c89eaa6ea47e172e2f49a..d3e67bcb25b3f9c5d671dd216e4664b380c2e627 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -69,9 +69,9 @@ class ToolbarView : public views::AccessiblePaneView,
   // Remove a menu listener.
   void RemoveMenuListener(views::MenuListener* listener);
 
-  // Gets a bitmap with the icon for the app menu and any overlaid notification
+  // Gets an image with the icon for the app menu and any overlaid notification
   // badge.
-  SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);
+  gfx::ImageSkia GetAppMenuIcon(views::CustomButton::ButtonState state);
 
   virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
 
@@ -182,7 +182,7 @@ class ToolbarView : public views::AccessiblePaneView,
 
   // Gets a badge for the wrench icon corresponding to the number of
   // unacknowledged background pages in the system.
-  SkBitmap GetBackgroundPageBadge();
+  gfx::ImageSkia GetBackgroundPageBadge();
 
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;