Move Icons out of Extension class

chrome/browser/ui/gtk/action_box_button_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/action_box_button_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
@@ skipping 30 matching lines @@
 };
 
 ExtensionIcon::ExtensionIcon(Profile* profile, const Extension* extension)
     : image_(NULL) {
   const ActionInfo* page_launcher_info =
       ActionInfo::GetPageLauncherInfo(extension);
   icon_.reset(new IconImage(profile,
                             extension,
                             page_launcher_info->default_icon,
                             extension_misc::EXTENSION_ICON_ACTION,
-                            Extension::GetDefaultIcon(true),
+                            extensions::IconsInfo::GetDefaultAppIcon(),
                             this));
   UpdateIcon();
 }
 
 GtkWidget* ExtensionIcon::GetWidget() {
   return image_;
 }
 
 void ExtensionIcon::OnExtensionIconImageChanged(IconImage* image)  {
   DCHECK_EQ(image, icon_.get());
@@ skipping 71 matching lines @@
       1,
       gtk_get_current_event_time());
 }
 
 gboolean ActionBoxButtonGtk::OnButtonPress(GtkWidget* widget,
                                            GdkEventButton* event) {
   if (event->button == 1)
     controller_.OnButtonClicked();
   return FALSE;
 }