Convert most of the rest of chrome to ImageSkia

chrome/browser/background/background_application_list_model.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/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 using extensions::ExtensionList;
 using extensions::UnloadedExtensionInfo;
 using extensions::UpdatedExtensionPermissionsInfo;
 
 class ExtensionNameComparator {
  public:
   explicit ExtensionNameComparator(icu::Collator* collator);
   bool operator()(const Extension* x, const Extension* y);
@@ skipping 26 matching lines @@
   // Invoked when a request icon is available.
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int index) OVERRIDE;
 
   // Uses the FILE thread to request this extension's icon, sized
   // appropriately.
   void RequestIcon(ExtensionIconSet::Icons size);
 
   const Extension* extension_;
-  scoped_ptr<SkBitmap> icon_;
+  scoped_ptr<gfx::ImageSkia> icon_;
   BackgroundApplicationListModel* model_;
   ImageLoadingTracker tracker_;
 };
 
 namespace {
 void GetServiceApplications(ExtensionService* service,
                             ExtensionList* applications_result) {
   const ExtensionSet* extensions = service->extensions();
 
   for (ExtensionSet::const_iterator cursor = extensions->begin();
@@ skipping 53 matching lines @@
       model_(model),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
 }
 
 void BackgroundApplicationListModel::Application::OnImageLoaded(
     const gfx::Image& image,
     const std::string& extension_id,
     int index) {
   if (image.IsEmpty())
     return;
-  icon_.reset(image.CopySkBitmap());
+  icon_.reset(image.CopyImageSkia());
   model_->SendApplicationDataChangedNotifications(extension_);
 }
 
 void BackgroundApplicationListModel::Application::RequestIcon(
     ExtensionIconSet::Icons size) {
   ExtensionResource resource = extension_->GetIconResource(
       size, ExtensionIconSet::MATCH_BIGGER);
   tracker_.LoadImage(extension_, resource, gfx::Size(size, size),
                      ImageLoadingTracker::CACHE);
 }
@@ skipping 73 matching lines @@
 }
 
 BackgroundApplicationListModel::Application*
 BackgroundApplicationListModel::FindApplication(
     const Extension* extension) {
   const std::string& id = extension->id();
   ApplicationMap::iterator found = applications_.find(id);
   return (found == applications_.end()) ? NULL : found->second;
 }
 
-const SkBitmap* BackgroundApplicationListModel::GetIcon(
+const gfx::ImageSkia* BackgroundApplicationListModel::GetIcon(
     const Extension* extension) {
   const Application* application = FindApplication(extension);
   if (application)
     return application->icon_.get();
   AssociateApplicationData(extension);
   return NULL;
 }
 
 int BackgroundApplicationListModel::GetPosition(
     const Extension* extension) const {
@@ skipping 148 matching lines @@
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
     FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
   }
 }