Move Icons out of Extension class

chrome/browser/ui/gtk/script_bubble_gtk.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/gtk/script_bubble_gtk.h"
 
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_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/browser/ui/gtk/gtk_theme_service.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 78 matching lines @@
     gtk_box_pack_start(GTK_BOX(bubble_content), item, FALSE, FALSE, 0);
 
     GtkWidget* image = gtk_image_new();
     gtk_widget_set_usize(image, 16, 16);
     gtk_box_pack_start(GTK_BOX(item), image, FALSE, FALSE, 0);
 
     // Load the image asynchronously.
     icon_controls_[extension->id()] = GTK_IMAGE(image);
     ImageLoader::Get(profile_)->LoadImageAsync(
         extension,
-        extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,
-                                   ExtensionIconSet::MATCH_EXACTLY),
+        extensions::IconsInfo::GetIconResource(
+            extension,
+            extension_misc::EXTENSION_ICON_BITTY,
+            ExtensionIconSet::MATCH_EXACTLY),
         gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
                   extension_misc::EXTENSION_ICON_BITTY),
         base::Bind(&ScriptBubbleGtk::OnIconLoaded,
                    weak_ptr_factory_.GetWeakPtr(),
                    extension->id()));
 
     GtkWidget* link = theme_provider->BuildChromeLinkButton(
         extension->name().c_str());
     gtk_box_pack_start(GTK_BOX(item), link, FALSE, FALSE, 0);
     link_controls_[GTK_WIDGET(link)] = extension->id();
@@ skipping 24 matching lines @@
 void ScriptBubbleGtk::OnItemLinkClicked(GtkWidget* button) {
   std::string link(chrome::kChromeUIExtensionsURL);
   link += "?id=" + link_controls_[button];
   web_contents_->OpenURL(OpenURLParams(GURL(link),
                                        Referrer(),
                                        NEW_FOREGROUND_TAB,
                                        content::PAGE_TRANSITION_LINK,
                                        false));
   Close();
 }