Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/views/widget/widget_delegate.h

Index: ui/views/widget/widget_delegate.h
diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
index 0f9440ac28de7a485797627a804bca6405d9df80..3239c1d75e7ef378836c6208abacb18b9f613b3b 100644
--- a/ui/views/widget/widget_delegate.h
+++ b/ui/views/widget/widget_delegate.h
@@ -12,9 +12,8 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/views/view.h"
 
-class SkBitmap;
-
 namespace gfx {
+class ImageSkia;
 class Rect;
 }
 
@@ -80,10 +79,10 @@ class VIEWS_EXPORT WidgetDelegate {
 
   // Returns the app icon for the window. On Windows, this is the ICON_BIG used
   // in Alt-Tab list and Win7's taskbar.
-  virtual SkBitmap GetWindowAppIcon();
+  virtual gfx::ImageSkia GetWindowAppIcon();
 
   // Returns the icon to be displayed in the window.
-  virtual SkBitmap GetWindowIcon();
+  virtual gfx::ImageSkia GetWindowIcon();
 
   // Returns true if a window icon should be shown.
   virtual bool ShouldShowWindowIcon() const;