Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/ui/views/infobars/extension_infobar.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/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.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 "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
@@ skipping 17 matching lines @@
       : gfx::CanvasImageSource(ComputeSize(drop_image), false),
         icon_(icon),
         drop_image_(drop_image) {
   }
 
   virtual ~MenuImageSource() {
   }
 
   // Overridden from gfx::CanvasImageSource
   void Draw(gfx::Canvas* canvas) OVERRIDE {
-    int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
+    int image_size = extension_misc::EXTENSION_ICON_BITTY;
     canvas->DrawImageInt(icon_, 0, 0, icon_.width(), icon_.height(), 0, 0,
                          image_size, image_size, false);
     canvas->DrawImageInt(drop_image_, image_size + kDropArrowLeftMargin,
                          image_size / 2);
   }
 
  private:
   gfx::Size ComputeSize(const gfx::ImageSkia& drop_image) const {
-    int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
+    int image_size = extension_misc::EXTENSION_ICON_BITTY;
     return gfx::Size(image_size + kDropArrowLeftMargin + drop_image.width(),
                      image_size);
   }
 
   // The margin between the extension icon and the drop-down arrow image.
   static const int kDropArrowLeftMargin = 3;
 
   const gfx::ImageSkia icon_;
   const gfx::ImageSkia drop_image_;
 
@@ skipping 52 matching lines @@
   AddChildView(extension_host->view());
 
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 
   // This must happen after adding all children because it can trigger layout,
   // which assumes that particular children (e.g. the close button) have already
   // been added.
   const extensions::Extension* extension = extension_host->extension();
-  ExtensionIconSet::Icons image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
+  extension_misc::ExtensionIcons image_size =
+      extension_misc::EXTENSION_ICON_BITTY;
   ExtensionResource icon_resource = extension->GetIconResource(
       image_size, ExtensionIconSet::MATCH_EXACTLY);
   tracker_.LoadImage(extension, icon_resource,
       gfx::Size(image_size, image_size), ImageLoadingTracker::DONT_CACHE);
 }
 
 int ExtensionInfoBar::ContentMinimumWidth() const {
   return menu_->GetPreferredSize().width() + kMenuHorizontalMargin;
 }
 
@@ skipping 37 matching lines @@
 
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser_);
   DCHECK_EQ(menu_, source);
   RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }