Move Icons out of Extension class

chrome/browser/extensions/app_icon_loader_impl.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/app_icon_loader_impl.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 namespace {
 
 const extensions::Extension* GetExtensionByID(Profile* profile,
                                               const std::string& id) {
   ExtensionService* service =
@@ skipping 28 matching lines @@
       return;  // Already loading the image.
   }
 
   const extensions::Extension* extension = GetExtensionByID(profile_, id);
   if (!extension)
     return;
 
   extensions::IconImage* image = new extensions::IconImage(
       profile_,
       extension,
-      extension->icons(),
+      extensions::IconsInfo::GetIcons(extension),
       icon_size_,
-      extensions::Extension::GetDefaultIcon(true),
+      extensions::IconsInfo::GetDefaultAppIcon(),
       this);
   // |map_| takes ownership of |image|.
   map_[image] = id;
 
   // Triggers image loading now instead of depending on paint message. This
   // makes the temp blank image be shown for shorter time and improves user
   // experience. See http://crbug.com/146114.
   image->image_skia().EnsureRepsForSupportedScaleFactors();
 }
 
@@ skipping 36 matching lines @@
   const bool enabled = service->IsExtensionEnabledForLauncher(id);
   if (!enabled) {
     const color_utils::HSL shift = {-1, 0, 0.6};
     image = gfx::ImageSkiaOperations::CreateHSLShiftedImage(image, shift);
   }
 
   delegate_->SetAppImage(id, image);
 }
 
 }  // namespace extensions