Move icon fallbacks into ExtensionAction.

chrome/browser/ui/views/browser_action_view.h

Index: chrome/browser/ui/views/browser_action_view.h
diff --git a/chrome/browser/ui/views/browser_action_view.h b/chrome/browser/ui/views/browser_action_view.h
index a2ab30fe347f7bd16e5fa622ddff6e94b21115a3..919ae26e7447533ec44708e60bc4a1914ecd1409 100644
--- a/chrome/browser/ui/views/browser_action_view.h
+++ b/chrome/browser/ui/views/browser_action_view.h
@@ -8,6 +8,7 @@
 #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"
@@ -45,8 +46,10 @@ class BrowserActionButton : public views::MenuButton,
   // 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();
@@ -125,9 +128,9 @@ class BrowserActionButton : public views::MenuButton,
   // 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_;