Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/ui/cocoa/infobars/extension_infobar_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/infobars/extension_infobar_controller.h"
 
 #include <cmath>
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
@@ skipping 36 matching lines @@
   virtual ~InfobarBridge() {
     if (delegate_)
       delegate_->set_observer(NULL);
   }
 
   // Load the Extension's icon image.
   void LoadIcon() {
     const extensions::Extension* extension = delegate_->extension_host()->
         extension();
     ExtensionResource icon_resource =
-        extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_BITTY,
+        extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,
                                    ExtensionIconSet::MATCH_EXACTLY);
     tracker_.LoadImage(extension, icon_resource,
-                       gfx::Size(ExtensionIconSet::EXTENSION_ICON_BITTY,
-                                 ExtensionIconSet::EXTENSION_ICON_BITTY),
+                       gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
+                                 extension_misc::EXTENSION_ICON_BITTY),
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   // ImageLoadingTracker::Observer implementation.
   // TODO(andybons): The infobar view implementations share a lot of the same
   // code. Come up with a strategy to share amongst them.
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int index) OVERRIDE {
     if (!delegate_)
       return;  // The delegate can go away while the image asynchronously loads.
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     // Fall back on the default extension icon on failure.
     const SkBitmap* icon;
     if (image.IsEmpty())
       icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
     else
       icon = image.ToSkBitmap();
 
     SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
-    const int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
+    const int image_size = extension_misc::EXTENSION_ICON_BITTY;
     scoped_ptr<gfx::Canvas> canvas(
         new gfx::Canvas(
             gfx::Size(image_size + kDropArrowLeftMarginPx + drop_image->width(),
                       image_size), ui::SCALE_FACTOR_100P, false));
     canvas->DrawImageInt(*icon,
                          0, 0, icon->width(), icon->height(),
                          0, 0, image_size, image_size,
                          false);
     canvas->DrawImageInt(*drop_image,
                          image_size + kDropArrowLeftMarginPx,
@@ skipping 158 matching lines @@
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   NSWindow* window =
       [(NSView*)owner->web_contents()->GetContentNativeView() window];
   ExtensionInfoBarController* controller =
       [[ExtensionInfoBarController alloc] initWithDelegate:this
                                                      owner:owner
                                                     window:window];
   return new InfoBar(controller, this);
 }