Move icon fallbacks into ExtensionAction.

chrome/browser/ui/views/browser_action_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 
 #include <string>
 
 #include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/common/extensions/extension_action.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class BrowserActionsContainer;
 class ExtensionAction;
 
 namespace views {
@@ skipping 17 matching lines @@
 
   // Call this instead of delete.
   void Destroy();
 
   ExtensionAction* browser_action() const { return browser_action_; }
   const extensions::Extension* extension() { return extension_; }
 
   // Called to update the display to match the browser action's state.
   void UpdateState();
 
-  // Returns the default icon, if any.
-  const SkBitmap& default_icon() const { return default_icon_; }
+  // Returns the icon that were loaded from paths, if any.
+  const ExtensionAction::PathToIconCache& loaded_icons() const {
+    return loaded_icons_;
+  }
 
   // Does this button's action have a popup?
   virtual bool IsPopup();
   virtual GURL GetPopupUrl();
 
   // Overridden from views::View:
   virtual bool CanHandleAccelerators() const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
@@ skipping 58 matching lines @@
   // by this class.
   ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   const extensions::Extension* extension_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
-  // The default icon for our browser action. This might be non-empty if the
-  // browser action had a value for default_icon in the manifest.
-  SkBitmap default_icon_;
+  // Icons loaded from paths.  Currently just the browser action's default icon
+  // if any.
+  ExtensionAction::PathToIconCache loaded_icons_;
 
   // The browser action shelf.
   BrowserActionsContainer* panel_;
 
   // The context menu.  This member is non-NULL only when the menu is shown.
   views::MenuItemView* context_menu_;
 
   content::NotificationRegistrar registrar_;
 
   // The extension keybinding accelerator this browser action is listening for
@@ skipping 36 matching lines @@
   // The container for this view.
   BrowserActionsContainer* panel_;
 
   // The button this view contains.
   BrowserActionButton* button_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_