Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/views/infobars/infobar_button_border.cc

Index: chrome/browser/ui/views/infobars/infobar_button_border.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc
index d7998b1e6012fd564451de8b5e2c3d1b6ead5ce2..45fc88f297d9c61d2cb5465cf9af57f8b8f28f17 100644
--- a/chrome/browser/ui/views/infobars/infobar_button_border.cc
+++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc
@@ -14,41 +14,41 @@ InfoBarButtonBorder::InfoBarButtonBorder() {
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   BorderImageSet normal_set = {
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_N).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_N).ToSkBitmap(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_N).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_N).ToImageSkia(),
   };
   set_normal_set(normal_set);
 
   BorderImageSet hot_set = {
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_H).ToSkBitmap(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_H).ToImageSkia(),
   };
   set_hot_set(hot_set);
 
   BorderImageSet pushed_set = {
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_P).ToSkBitmap(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_TOP_RIGHT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_CENTER_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_RIGHT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_INFOBARBUTTON_BOTTOM_RIGHT_P).ToImageSkia(),
   };
   set_pushed_set(pushed_set);
 }