Move icon fallbacks into ExtensionAction.

chrome/browser/ui/gtk/location_bar_view_gtk.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_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
@@ skipping 285 matching lines @@
         const ExtensionAction::IconAnimation& animation) OVERRIDE;
 
     // The location bar view that owns us.
     LocationBarViewGtk* 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_;
 
     // A cache of all the different icon paths associated with this page action.
-    typedef std::map<std::string, GdkPixbuf*> PixbufMap;
-    PixbufMap pixbufs_;
-
-    // A cache of the last dynamically generated bitmap and the pixbuf that
-    // corresponds to it. We keep track of both so we can free old pixbufs as
-    // their icons are replaced.
-    SkBitmap last_icon_skbitmap_;
-    GdkPixbuf* last_icon_pixbuf_;
+    ExtensionAction::PathToIconCache loaded_icons_;
 
     // The object that is waiting for the image loading to complete
     // asynchronously.
     ImageLoadingTracker tracker_;
 
     // The widgets for this page action.
     ui::OwnedWidgetGtk event_box_;
     ui::OwnedWidgetGtk image_;
 
     // The tab id we are currently showing the icon for.
@@ skipping 215 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // Used to remember the URL and title text when drag&drop has begun.
   GURL drag_url_;
   string16 drag_title_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_