Move Icons out of Extension class

chrome/browser/extensions/app_shortcut_manager.cc

-// 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.
 
 #include "chrome/browser/extensions/app_shortcut_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #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"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/app_host_installer_win.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 104 matching lines @@
 }
 #endif
 
 void AppShortcutManager::UpdateApplicationShortcuts(
     const Extension* extension) {
   shortcut_info_ = ShortcutInfoForExtensionAndProfile(extension, profile_);
 
   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,
           ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
           gfx::Size(size, size),
           ui::SCALE_FACTOR_100P));
     }
   }
 
   if (info_list.empty()) {
     size_t i = arraysize(kDesiredSizes) - 1;
     int size = kDesiredSizes[i];
 
     // 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,
         ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
         gfx::Size(size, size),
         ui::SCALE_FACTOR_100P));
   }
 
   // |icon_resources| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   tracker_.LoadImages(extension, info_list, ImageLoadingTracker::DONT_CACHE);
 }
 
 void AppShortcutManager::DeleteApplicationShortcuts(
     const Extension* extension) {
   ShellIntegration::ShortcutInfo delete_info =
       ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }
 
 }  // namespace extensions