Move Icons out of Extension class

chrome/browser/extensions/extension_icon_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/extension_icon_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.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 "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/favicon_size.h"
@@ skipping 24 matching lines @@
 
 ExtensionIconManager::ExtensionIconManager()
     : ALLOW_THIS_IN_INITIALIZER_LIST(image_tracker_(this)),
       monochrome_(false) {
 }
 
 ExtensionIconManager::~ExtensionIconManager() {
 }
 
 void ExtensionIconManager::LoadIcon(const extensions::Extension* extension) {
-  ExtensionResource icon_resource = extension->GetIconResource(
-      extension_misc::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_BIGGER);
+  ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+      extension,
+      extension_misc::EXTENSION_ICON_BITTY,
+      ExtensionIconSet::MATCH_BIGGER);
   if (!icon_resource.extension_root().empty()) {
     // Insert into pending_icons_ first because LoadImage can call us back
     // synchronously if the image is already cached.
     pending_icons_.insert(extension->id());
     image_tracker_.LoadImage(extension,
                              icon_resource,
                              gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize),
                              ImageLoadingTracker::CACHE);
   }
 }
@@ skipping 53 matching lines @@
   if (monochrome_) {
     color_utils::HSL shift = {-1, 0, 0.6};
     result = SkBitmapOperations::CreateHSLShiftedBitmap(result, shift);
   }
 
   if (!padding_.empty())
     result = ApplyPadding(result, padding_);
 
   return result;
 }