Move Icons out of Extension class

chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/toolbar/action_box_menu_model.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"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 @interface ActionBoxMenuBubbleController (Private)
@@ skipping 31 matching lines @@
                             ActionBoxMenuItemController* controller)
       : controller_(controller) {
     const extensions::ActionInfo* page_launcher_info =
         extensions::ActionInfo::GetPageLauncherInfo(extension);
     DCHECK(page_launcher_info);
     icon_loader_.reset(new extensions::IconImage(
         profile,
         extension,
         page_launcher_info->default_icon,
         extension_misc::EXTENSION_ICON_ACTION,
-        extensions::Extension::GetDefaultIcon(true),
+        extensions::IconsInfo::GetDefaultAppIcon(),
         this));
     OnExtensionIconImageChanged(icon_loader_.get());
   }
 
  private:
   virtual void OnExtensionIconImageChanged(
       extensions::IconImage* image) OVERRIDE {
     [controller_ onExtensionIconImageChanged:
         gfx::NSImageFromImageSkia(image->image_skia())];
   }
@@ skipping 364 matching lines @@
 - (void)accessibilityPerformAction:(NSString*)action {
   if ([action isEqual:NSAccessibilityPressAction]) {
     [viewController_ itemSelected:self];
     return;
   }
 
   [super accessibilityPerformAction:action];
 }
 
 @end