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

ui/views/widget/native_widget_win.h

Index: ui/views/widget/native_widget_win.h
diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h
index 61019a90e48301ab56288f520f0782a48af8f82e..913c2a8ffbfa6e051a45b824b8535ed96a3de31a 100644
--- a/ui/views/widget/native_widget_win.h
+++ b/ui/views/widget/native_widget_win.h
@@ -6,8 +6,8 @@
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 #pragma once
 
-#include <atlbase.h>
 #include <atlapp.h>
+#include <atlbase.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
@@ -204,8 +204,8 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
      gfx::Rect* bounds,
      ui::WindowShowState* show_state) const OVERRIDE;
   virtual void SetWindowTitle(const string16& title) OVERRIDE;
-  virtual void SetWindowIcons(const SkBitmap& window_icon,
-                              const SkBitmap& app_icon) OVERRIDE;
+  virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
+                              const gfx::ImageSkia& app_icon) OVERRIDE;
   virtual void SetAccessibleName(const string16& name) OVERRIDE;
   virtual void SetAccessibleRole(ui::AccessibilityTypes::Role role) OVERRIDE;
   virtual void SetAccessibleState(ui::AccessibilityTypes::State state) OVERRIDE;