Move Icons out of Extension class

chrome/browser/ui/views/infobars/extension_infobar.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/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.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 "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
@@ skipping 115 matching lines @@
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 
   // This must happen after adding all children because it can trigger layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
   const extensions::Extension* extension = extension_host->extension();
   extension_misc::ExtensionIcons image_size =
       extension_misc::EXTENSION_ICON_BITTY;
-  ExtensionResource icon_resource = extension->GetIconResource(
-      image_size, ExtensionIconSet::MATCH_EXACTLY);
+  ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+      extension, image_size, ExtensionIconSet::MATCH_EXACTLY);
   extensions::ImageLoader* loader =
       extensions::ImageLoader::Get(extension_host->profile());
   loader->LoadImageAsync(
       extension,
       icon_resource,
       gfx::Size(image_size, image_size),
       base::Bind(&ExtensionInfoBar::OnImageLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 46 matching lines @@
   }
 
   infobar_icon_->SetVisible(true);
 
   Layout();
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }