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

ui/views/widget/widget_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetDelegate:
@@ skipping 51 matching lines @@
 }
 
 string16 WidgetDelegate::GetWindowTitle() const {
   return string16();
 }
 
 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 {
   return false;
 }
 
 bool WidgetDelegate::ExecuteWindowsCommand(int command_id) {
   return false;
 }
 
@@ skipping 55 matching lines @@
 
 Widget* WidgetDelegateView::GetWidget() {
   return View::GetWidget();
 }
 
 const Widget* WidgetDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 }  // namespace views