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

chrome/browser/ui/gtk/gtk_tree.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 "chrome/browser/ui/gtk/gtk_tree.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace gtk_tree {
 
 gint GetRowNumForPath(GtkTreePath* path) {
   gint* indices = gtk_tree_path_get_indices(path);
   if (!indices) {
     NOTREACHED();
     return -1;
   }
   return indices[0];
@@ skipping 320 matching lines @@
 
 TreeAdapter::TreeAdapter(Delegate* delegate, ui::TreeModel* tree_model)
     : delegate_(delegate),
       tree_model_(tree_model) {
   tree_store_ = gtk_tree_store_new(COL_COUNT,
                                    GDK_TYPE_PIXBUF,
                                    G_TYPE_STRING,
                                    G_TYPE_POINTER);
   tree_model->AddObserver(this);
 
-  std::vector<SkBitmap> icons;
+  std::vector<gfx::ImageSkia> icons;
   tree_model->GetIcons(&icons);
   for (size_t i = 0; i < icons.size(); ++i) {
-    pixbufs_.push_back(gfx::GdkPixbufFromSkBitmap(icons[i]));
+    pixbufs_.push_back(gfx::GdkPixbufFromSkBitmap(*icons[i].bitmap()));
   }
 }
 
 TreeAdapter::~TreeAdapter() {
   g_object_unref(tree_store_);
   for (size_t i = 0; i < pixbufs_.size(); ++i)
     g_object_unref(pixbufs_[i]);
 }
 
 void TreeAdapter::Init() {
@@ skipping 99 matching lines @@
 void TreeAdapter::TreeNodeChanged(ui::TreeModel* model,
                                   ui::TreeModelNode* node) {
   delegate_->OnAnyModelUpdateStart();
   GtkTreeIter iter;
   if (GetTreeIter(node, &iter))
     FillRow(&iter, node);
   delegate_->OnAnyModelUpdate();
 }
 
 }  // namespace gtk_tree