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

ui/views/widget/native_widget_win.cc

Index: ui/views/widget/native_widget_win.cc
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index da0e0ebeeacef6e0de4046f3d93b8db310301ee4..ac234835b5a39624343fa46fd87e7a2af77febe7 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -21,6 +21,7 @@
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
@@ -29,7 +30,6 @@
 #include "ui/gfx/canvas_paint.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/icon_util.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/accessibility/native_view_accessibility_win.h"
@@ -719,8 +719,8 @@ void NativeWidgetWin::SetWindowTitle(const string16& title) {
   SetAccessibleName(title);
 }
 
-void NativeWidgetWin::SetWindowIcons(const SkBitmap& window_icon,
-                                     const SkBitmap& app_icon) {
+void NativeWidgetWin::SetWindowIcons(const gfx::ImageSkia& window_icon,
+                                     const gfx::ImageSkia& app_icon) {
   if (!window_icon.isNull()) {
     HICON windows_icon = IconUtil::CreateHICONFromSkBitmap(window_icon);
     // We need to make sure to destroy the previous icon, otherwise we'll leak