Move Icons out of Extension class

chrome/browser/extensions/app_shortcut_manager.cc

Index: chrome/browser/extensions/app_shortcut_manager.cc
diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc
index e1ff3f8361db80f18c60fc0574f1bb62a06f9ba9..9469f430014b85cef9b8bdc530fb95bb54ae7747 100644
--- a/chrome/browser/extensions/app_shortcut_manager.cc
+++ b/chrome/browser/extensions/app_shortcut_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
@@ -14,6 +14,7 @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ -138,8 +139,8 @@ void AppShortcutManager::UpdateApplicationShortcuts(
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   for (size_t i = 0; i < arraysize(kDesiredSizes); ++i) {
     int size = kDesiredSizes[i];
-    ExtensionResource resource = extension->GetIconResource(
-        size, ExtensionIconSet::MATCH_EXACTLY);
+    ExtensionResource resource = IconsInfo::GetIconResource(
+        extension, size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
       info_list.push_back(ImageLoadingTracker::ImageRepresentation(
           resource,
@@ -156,11 +157,11 @@ void AppShortcutManager::UpdateApplicationShortcuts(
     // If there is no icon at the desired sizes, we will resize what we can get.
     // Making a large icon smaller is prefered to making a small icon larger, so
     // look for a larger icon first:
-    ExtensionResource resource = extension->GetIconResource(
-        size, ExtensionIconSet::MATCH_BIGGER);
+    ExtensionResource resource = IconsInfo::GetIconResource(
+        extension, size, ExtensionIconSet::MATCH_BIGGER);
     if (resource.empty()) {
-      resource = extension->GetIconResource(
-          size, ExtensionIconSet::MATCH_SMALLER);
+      resource = IconsInfo::GetIconResource(
+          extension, size, ExtensionIconSet::MATCH_SMALLER);
     }
     info_list.push_back(ImageLoadingTracker::ImageRepresentation(
         resource,