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

ui/views/widget/widget_delegate.cc

Index: ui/views/widget/widget_delegate.cc
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc
index baaf65bfe39bafb7e6b6ce7532e3ba5d4d2b6bcd..c98578014d63cf0704408f6e11e7da5b111e9116 100644
--- a/ui/views/widget/widget_delegate.cc
+++ b/ui/views/widget/widget_delegate.cc
@@ -5,7 +5,7 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #include "base/utf_string_conversions.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
@@ -77,14 +77,14 @@ bool WidgetDelegate::ShouldShowWindowTitle() const {
   return true;
 }
 
-SkBitmap WidgetDelegate::GetWindowAppIcon() {
+gfx::ImageSkia WidgetDelegate::GetWindowAppIcon() {
   // Use the window icon as app icon by default.
   return GetWindowIcon();
 }
 
 // Returns the icon to be displayed in the window.
-SkBitmap WidgetDelegate::GetWindowIcon() {
-  return SkBitmap();
+gfx::ImageSkia WidgetDelegate::GetWindowIcon() {
+  return gfx::ImageSkia();
 }
 
 bool WidgetDelegate::ShouldShowWindowIcon() const {