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

ui/views/controls/tree/tree_view_win.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/controls/tree/tree_view_win.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 639 matching lines @@
   DCHECK(tree_view_ && tree_item);
   TV_ITEM tv_item = {0};
   tv_item.hItem = tree_item;
   tv_item.mask = TVIF_PARAM;
   if (TreeView_GetItem(tree_view_, &tv_item))
     return GetNodeDetailsByID(static_cast<int>(tv_item.lParam));
   return NULL;
 }
 
 HIMAGELIST TreeView::CreateImageList() {
-  std::vector<SkBitmap> model_images;
+  std::vector<gfx::ImageSkia> model_images;
   model_->GetIcons(&model_images);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   bool rtl = base::i18n::IsRTL();
   // Creates the default image list used for trees.
-  const SkBitmap* closed_icon = rb.GetImageNamed(
-      (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED)).ToSkBitmap();
-  const SkBitmap* opened_icon = rb.GetImageNamed(
-      (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN)).ToSkBitmap();
+  const gfx::ImageSkia* closed_icon = rb.GetImageNamed(
+      (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED)).ToImageSkia();
+  const gfx::ImageSkia* opened_icon = rb.GetImageNamed(
+      (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN)).ToImageSkia();
   int width = closed_icon->width();
   int height = closed_icon->height();
   DCHECK(opened_icon->width() == width && opened_icon->height() == height);
   HIMAGELIST image_list =
       ImageList_Create(width, height, ILC_COLOR32, model_images.size() + 2,
                        model_images.size() + 2);
   if (image_list) {
     // NOTE: the order the images are added in effects the selected
     // image index when adding items to the tree. If you change the
     // order you'll undoubtedly need to update itemex.iSelectedImage
@@ skipping 113 matching lines @@
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views