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

ui/views/widget/widget_delegate.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
 #pragma once
 
 #include <string>
 
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/view.h"
 
-class SkBitmap;
-
 namespace gfx {
+class ImageSkia;
 class Rect;
 }
 
 namespace views {
 class BubbleDelegateView;
 class ClientView;
 class DialogDelegate;
 class NonClientFrameView;
 class View;
 class Widget;
@@ skipping 45 matching lines @@
   virtual string16 GetAccessibleWindowTitle() const;
 
   // Returns the text to be displayed in the window title.
   virtual string16 GetWindowTitle() const;
 
   // Returns true if the window should show a title in the title bar.
   virtual bool ShouldShowWindowTitle() const;
 
   // 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;
 
   // Execute a command in the window's controller. Returns true if the command
   // was handled, false if it was not.
   virtual bool ExecuteWindowsCommand(int command_id);
 
   // Returns the window's name identifier. Used to identify this window for
   // state restoration.
@@ skipping 71 matching lines @@
   virtual Widget* GetWidget() OVERRIDE;
   virtual const Widget* GetWidget() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_