Converts remainder of ui (except for ui/app_list) and chrome/browser/ui/views/frame to use ImageSkia

Do conversion using the same sed script as for 10437006

Modified by hand afterwards:
  1 chrome/browser/download/download_util.cc
  2 chrome/browser/ui/panels/panel_browser_frame_view.cc
  3 chrome/browser/ui/panels/panel_browser_frame_view.h
  4 chrome/browser/ui/toolbar/wrench_menu_model.cc
  5 chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
  6 chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
  7 chrome/browser/ui/views/constrained_window_views.cc
  8 chrome/browser/ui/views/frame/glass_browser_frame_view.cc
  9 chrome/browser/ui/views/tab_icon_view.h
 10 ui/base/dragdrop/drag_utils.h
 11 ui/base/dragdrop/drag_utils_gtk.cc
 12 ui/base/dragdrop/drag_utils_win.cc
 13 ui/base/native_theme/native_theme_android.cc
 14 ui/base/native_theme/native_theme_android.h
 15 ui/base/native_theme/native_theme_base.cc
 16 ui/base/native_theme/native_theme_base.h
 17 ui/views/widget/native_widget_private.h
 18 ui/views/window/frame_background.h
 19 ui/views/window/window_resources.h

Line wrapping and include fixes
chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
  1 chrome/browser/ui/views/frame/browser_view.cc
  2 chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
  3 ui/base/dragdrop/drag_utils_aura.cc
  4 ui/base/dragdrop/os_exchange_data_provider_aura.h
  5 ui/base/native_theme/native_theme_aura.cc
  6 ui/views/button_drag_utils.h
  7 ui/views/painter.cc
  8 ui/views/painter.h
  9 ui/views/widget/native_widget_aura.cc
 10 ui/views/widget/widget_delegate.h
 11 ui/views/window/custom_frame_view.cc
 12 ui/views/window/custom_frame_view.h

Test=Compiles, Webkit layout tests fast/ pass
Bug=124566




Review URL: https://chromiumcodereview.appspot.com/10447053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139734 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 18 insertions, 18 deletions

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 90b17b9..a2e3a47 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -404,8 +404,8 @@ void NativeWidgetAura::SetWindowTitle(const string16& title) {
   window_->set_title(title);
 }
 
-void NativeWidgetAura::SetWindowIcons(const SkBitmap& window_icon,
-                                     const SkBitmap& app_icon) {
+void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon,
+                                      const gfx::ImageSkia& app_icon) {
   // Aura doesn't have window icons.
 }
 
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index 7d89a77..8b4c7c5 100644
--- a/ui/views/widget/native_widget_aura.h
+++ b/ui/views/widget/native_widget_aura.h
@@ -74,8 +74,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
       gfx::Rect* bounds,
       ui::WindowShowState* maximized) 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;
diff --git a/ui/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h
index a56e5a6d..7eb8606 100644
--- a/ui/views/widget/native_widget_private.h
+++ b/ui/views/widget/native_widget_private.h
@@ -13,6 +13,7 @@
 #include "ui/views/widget/native_widget.h"
 
 namespace gfx {
+class ImageSkia;
 class Rect;
 }
 
@@ -150,8 +151,8 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget,
   // Sets the Window icons. |window_icon| is a 16x16 icon suitable for use in
   // a title bar. |app_icon| is a larger size for use in the host environment
   // app switching UI.
-  virtual void SetWindowIcons(const SkBitmap& window_icon,
-                              const SkBitmap& app_icon) = 0;
+  virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,
+                              const gfx::ImageSkia& app_icon) = 0;
 
   // Update native accessibility properties on the native window.
   virtual void SetAccessibleName(const string16& name) = 0;
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index 4ae16e2..ac23483 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -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
diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h
index 61019a9..d584390 100644
--- a/ui/views/widget/native_widget_win.h
+++ b/ui/views/widget/native_widget_win.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;
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc
index baaf65b..c985780 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 {
diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
index 0f9440a..3239c1d 100644
--- a/ui/views/widget/widget_delegate.h
+++ b/ui/views/widget/widget_delegate.h
@@ -12,9 +12,8 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/views/view.h"
 
-class SkBitmap;
-
 namespace gfx {
+class ImageSkia;
 class Rect;
 }
 
@@ -80,10 +79,10 @@ class VIEWS_EXPORT WidgetDelegate {
 
   // 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;