Move Icons out of Extension class

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_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/extension_system.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/permissions/permission_set.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"
@@ skipping 112 matching lines @@
 void BackgroundApplicationListModel::Application::OnImageLoaded(
     const gfx::Image& image) {
   if (image.IsEmpty())
     return;
   icon_.reset(image.CopyImageSkia());
   model_->SendApplicationDataChangedNotifications(extension_);
 }
 
 void BackgroundApplicationListModel::Application::RequestIcon(
     extension_misc::ExtensionIcons size) {
-  ExtensionResource resource = extension_->GetIconResource(
-      size, ExtensionIconSet::MATCH_BIGGER);
+  ExtensionResource resource = extensions::IconsInfo::GetIconResource(
+      extension_, size, ExtensionIconSet::MATCH_BIGGER);
   extensions::ImageLoader::Get(model_->profile_)->LoadImageAsync(
       extension_, resource, gfx::Size(size, size),
       base::Bind(&Application::OnImageLoaded, AsWeakPtr()));
 }
 
 BackgroundApplicationListModel::~BackgroundApplicationListModel() {
   STLDeleteContainerPairSecondPointers(applications_.begin(),
                                        applications_.end());
 }
 
@@ skipping 241 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_));
   }
 }