Move Icons out of Extension class

chrome/browser/ui/web_applications/web_app_ui.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/ui/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 376 matching lines @@
 void UpdateShortcutInfoAndIconForApp(
     const extensions::Extension& extension,
     Profile* profile,
     const web_app::ShortcutInfoCallback& callback) {
   ShellIntegration::ShortcutInfo shortcut_info =
       ShortcutInfoForExtensionAndProfile(&extension, profile);
 
   std::vector<extensions::ImageLoader::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 = extensions::IconsInfo::GetIconResource(
+        &extension, size, ExtensionIconSet::MATCH_EXACTLY);
     if (!resource.empty()) {
       info_list.push_back(extensions::ImageLoader::ImageRepresentation(
           resource,
           extensions::ImageLoader::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 preferred to making a small icon larger,
     // so look for a larger icon first:
-    ExtensionResource resource = extension.GetIconResource(
-        size, ExtensionIconSet::MATCH_BIGGER);
+    ExtensionResource resource = extensions::IconsInfo::GetIconResource(
+        &extension, size, ExtensionIconSet::MATCH_BIGGER);
     if (resource.empty()) {
-      resource = extension.GetIconResource(
-          size, ExtensionIconSet::MATCH_SMALLER);
+      resource = extensions::IconsInfo::GetIconResource(
+          &extension, size, ExtensionIconSet::MATCH_SMALLER);
     }
     info_list.push_back(extensions::ImageLoader::ImageRepresentation(
         resource,
         extensions::ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
         gfx::Size(size, size),
         ui::SCALE_FACTOR_100P));
   }
 
   // |info_list| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
 
 }  // namespace web_app