Move Icons out of Extension class

chrome/browser/ui/views/script_bubble_view.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/ui/views/script_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/script_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.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/url_constants.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ skipping 50 matching lines @@
     // scripts survive their extensions being disabled.
     const Extension* extension =
         extension_service->GetExtensionById(*iter, true);
     ScriptEntry entry;
     entry.extension_id = *iter;
     entry.extension_name = UTF8ToUTF16(extension->name());
     entries_.push_back(entry);
 
     int size = extension_misc::EXTENSION_ICON_BITTY;
     ExtensionResource image =
-        extension->GetIconResource(size,
-                                   ExtensionIconSet::MATCH_BIGGER);
+        extensions::IconsInfo::GetIconResource(extension,
+                                               size,
+                                               ExtensionIconSet::MATCH_BIGGER);
     extensions::ImageLoader::Get(profile)->LoadImageAsync(
         extension, image, gfx::Size(size, size),
         base::Bind(&ScriptBubbleView::OnImageLoaded, AsWeakPtr(), i));
   }
 }
 
 ScriptBubbleView::~ScriptBubbleView() {
 }
 
 gfx::Size ScriptBubbleView::GetPreferredSize() {
@@ skipping 60 matching lines @@
 
   layout->AddPaddingRow(0, kPaddingBelowHeadline);
   height_ += kPaddingBelowHeadline;
 
   for (size_t i = 0; i < entries_.size(); ++i) {
     layout->StartRow(0, 1);
 
     views::ImageView* image_view = new views::ImageView();
     entries_[i].extension_imageview = image_view;
     image_view->SetImageSize(gfx::Size(16, 16));
-    image_view->SetImage(Extension::GetDefaultIcon(false));
+    image_view->SetImage(
+        extensions::IconsInfo::GetDefaultIcon(false));  // not app
     layout->AddView(image_view);
 
     views::Link* link = new views::Link(entries_[i].extension_name);
     link->SetFont(link->font().DeriveFont(2));
     link->set_id(i);
     link->set_listener(this);
     layout->AddView(link);
 
     height_ += std::max(image_view->GetPreferredSize().height(),
                         link->GetPreferredSize().height());
@@ skipping 13 matching lines @@
     const gfx::ImageSkia* image_skia = image.ToImageSkia();
     entries_[index].extension_imageview->SetImage(image_skia);
   }
 }
 
 ScriptBubbleController* ScriptBubbleView::GetScriptBubbleController() {
   extensions::TabHelper* extensions_tab_helper =
       extensions::TabHelper::FromWebContents(web_contents_);
   return extensions_tab_helper->script_bubble_controller();
 }