Move icon fallbacks into ExtensionAction.

chrome/browser/ui/views/location_bar/page_action_image_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_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 
 #include <map>
 #include <string>
 
@@ skipping 86 matching lines @@
   LocationBarView* owner_;
 
   // The PageAction that this view represents. The PageAction is not owned by
   // us, it resides in the extension of this particular profile.
   ExtensionAction* page_action_;
 
   // The corresponding browser.
   Browser* browser_;
 
   // A cache of bitmaps the page actions might need to show, mapped by path.
-  typedef std::map<std::string, SkBitmap> PageActionMap;
-  PageActionMap page_action_icons_;
+  ExtensionAction::PathToIconCache page_action_icons_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
   // The tab id we are currently showing the icon for.
   int current_tab_id_;
 
   // The URL we are currently showing the icon for.
   GURL current_url_;
@@ skipping 17 matching lines @@
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   // Fade-in animation for the icon with observer scoped to this.
   ExtensionAction::IconAnimation::ScopedObserver
       scoped_icon_animation_observer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_