Move Icons out of Extension class

chrome/browser/extensions/api/management/management_api.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/extensions/api/management/management_api.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 12 matching lines @@
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_utility_messages.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/api/management.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/manifest_url_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
@@ skipping 88 matching lines @@
   if (!extensions::ManifestURL::GetUpdateURL(&extension).is_empty()) {
     info->update_url.reset(new std::string(
         extensions::ManifestURL::GetUpdateURL(&extension).spec()));
   }
 
   if (extension.is_app()) {
     info->app_launch_url.reset(new std::string(
         extension.GetFullLaunchURL().spec()));
   }
 
-  const ExtensionIconSet::IconMap& icons = extension.icons().map();
+  const ExtensionIconSet::IconMap& icons =
+      extensions::IconsInfo::GetIcons(&extension).map();
   if (!icons.empty()) {
     info->icons.reset(new IconInfoList());
     ExtensionIconSet::IconMap::const_iterator icon_iter;
     for (icon_iter = icons.begin(); icon_iter != icons.end(); ++icon_iter) {
       management::IconInfo* icon_info = new management::IconInfo();
       icon_info->size = icon_iter->first;
       GURL url = ExtensionIconSource::GetIconURL(
           &extension, icon_info->size, ExtensionIconSet::MATCH_EXACTLY, false,
           NULL);
       icon_info->url = url.spec();
@@ skipping 558 matching lines @@
 ProfileKeyedAPIFactory<ManagementAPI>* ManagementAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(new ManagementEventRouter(profile_));
   ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
 }
 
 }  // namespace extensions