Move Icons out of Extension class

chrome/browser/ui/views/script_bubble_view.cc

Index: chrome/browser/ui/views/script_bubble_view.cc
diff --git a/chrome/browser/ui/views/script_bubble_view.cc b/chrome/browser/ui/views/script_bubble_view.cc
index 81c7073d3f8ee4ce530e7f50523fdb89d3cdc744..aee2258ce305837d2ddacee92a4d48e249195d0c 100644
--- a/chrome/browser/ui/views/script_bubble_view.cc
+++ b/chrome/browser/ui/views/script_bubble_view.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -11,6 +11,7 @@
 #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"
@@ -81,8 +82,9 @@ ScriptBubbleView::ScriptBubbleView(views::View* anchor_view,
 
     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));
@@ -163,7 +165,8 @@ void ScriptBubbleView::Init() {
     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);