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

chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
 
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #import "base/mac/mac_util.h"
@@ skipping 24 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "third_party/apple_sample_code/ImageAndTextCell.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 // Colors for the infobar.
 const double kBannerGradientColorTop[3] =
     {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0};
 const double kBannerGradientColorBottom[3] =
     {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0};
 const double kBannerStrokeColor = 135.0 / 255.0;
 
 enum TabViewItemIndices {
@@ skipping 345 matching lines @@
                            blocked_lsos.local_storages()->Clone(),
                            blocked_lsos.session_storages()->Clone(),
                            blocked_lsos.appcaches()->Clone(),
                            blocked_lsos.indexed_dbs()->Clone(),
                            blocked_lsos.file_systems()->Clone(),
                            NULL,
                            blocked_lsos.server_bound_certs()->Clone(),
                            true));
 
   // Convert the model's icons from Skia to Cocoa.
-  std::vector<SkBitmap> skiaIcons;
+  std::vector<gfx::ImageSkia> skiaIcons;
   allowedTreeModel_->GetIcons(&skiaIcons);
   icons_.reset([[NSMutableArray alloc] init]);
-  for (std::vector<SkBitmap>::iterator it = skiaIcons.begin();
+  for (std::vector<gfx::ImageSkia>::iterator it = skiaIcons.begin();
        it != skiaIcons.end(); ++it) {
-    [icons_ addObject:gfx::SkBitmapToNSImage(*it)];
+    [icons_ addObject:gfx::SkBitmapToNSImage(*it->bitmap())];
   }
 
   // Default icon will be the last item in the array.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // TODO(rsesek): Rename this resource now that it's in multiple places.
   [icons_ addObject:rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER)];
 
   // Create the Cocoa model.
   CookieTreeNode* root =
       static_cast<CookieTreeNode*>(allowedTreeModel_->GetRoot());
@@ skipping 127 matching lines @@
       treeController = blockedTreeController_;
       break;
     default:
       NOTREACHED();
       return;
   }
   [detailsViewController_ configureBindingsForTreeController:treeController];
 }
 
 @end