Move icon fallbacks into ExtensionAction.

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.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/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 109 matching lines @@
     DCHECK(extension_->browser_action());
 
     // The Browser Action API does not allow the default icon path to be
     // changed at runtime, so we can load this now and cache it.
     std::string path = extension_->browser_action()->default_icon_path();
     if (!path.empty()) {
       tracker_.LoadImage(extension_, extension_->GetResource(path),
                          gfx::Size(Extension::kBrowserActionIconMaxSize,
                                    Extension::kBrowserActionIconMaxSize),
                          ImageLoadingTracker::DONT_CACHE);
-    } else {
-      const SkBitmap* bm =
-          ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-              IDR_EXTENSIONS_FAVICON).ToSkBitmap();
-      default_skbitmap_ = *bm;
-      default_icon_ = gfx::GdkPixbufFromSkBitmap(*bm);
     }
 
     UpdateState();
 
     signals_.Connect(button(), "button-press-event",
                      G_CALLBACK(OnButtonPress), this);
     signals_.Connect(button(), "clicked",
                      G_CALLBACK(OnClicked), this);
     signals_.Connect(button(), "drag-begin",
                      G_CALLBACK(&OnDragBegin), this);
@@ skipping 53 matching lines @@
       NOTREACHED();
       break;
     }
   }
 
   // ImageLoadingTracker::Observer implementation.
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
     if (!image.IsEmpty()) {
-      default_skbitmap_ = *image.ToSkBitmap();
-      default_icon_ =
-          static_cast<GdkPixbuf*>(g_object_ref(image.ToGdkPixbuf()));
+      loaded_icons_[extension_->browser_action()->default_icon_path()] = image;
     }

[not at google - send to devlin, 2012/07/26 02:29:44]

nit: remove surrounding {}

[Jeffrey Yasskin, 2012/07/26 21:11:47]

Done.

     UpdateState();
   }
 
   // Updates the button based on the latest state from the associated
   // browser action.
   void UpdateState() {
     int tab_id = toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return;
 
     std::string tooltip = extension_->browser_action()->GetTitle(tab_id);
     if (tooltip.empty())
       gtk_widget_set_has_tooltip(button(), FALSE);
     else
       gtk_widget_set_tooltip_text(button(), tooltip.c_str());
 
-    SkBitmap image = extension_->browser_action()->GetIcon(tab_id);
-    if (!image.isNull()) {
-      GdkPixbuf* previous_gdk_icon = tab_specific_icon_;
-      tab_specific_icon_ = gfx::GdkPixbufFromSkBitmap(image);
-      SetImage(tab_specific_icon_);
-      if (previous_gdk_icon)
-        g_object_unref(previous_gdk_icon);
-    } else if (default_icon_) {
-      SetImage(default_icon_);
+    gfx::Image image = extension_->browser_action()->GetIcon(
+        tab_id, loaded_icons_);
+    if (!image.IsEmpty()) {
+      SetImage(image.ToGdkPixbuf());
     }

[not at google - send to devlin, 2012/07/26 02:29:44]

same nit

[Jeffrey Yasskin, 2012/07/26 21:11:47]

Ah the perils of removing code. :)

     bool enabled = extension_->browser_action()->GetIsVisible(tab_id);
     gtk_widget_set_sensitive(button(), enabled);
 
     gtk_widget_queue_draw(button());
   }
 
   SkBitmap GetIcon() {
-    const SkBitmap& image = extension_->browser_action()->GetIcon(
-        toolbar_->GetCurrentTabId());
-    if (!image.isNull()) {
-      return image;
-    } else {
-      return default_skbitmap_;
-    }
+    return *extension_->browser_action()->GetIcon(
+        toolbar_->GetCurrentTabId(), loaded_icons_).ToSkBitmap();
   }
 
   MenuGtk* GetContextMenu() {
     if (!extension_->ShowConfigureContextMenus())
       return NULL;
 
     context_menu_model_ =
         new ExtensionContextMenuModel(extension_, toolbar_->browser(), this);
     context_menu_.reset(
         new MenuGtk(this, context_menu_model_.get()));
@@ skipping 191 matching lines @@
   // GTK widget hierarchy invalidates all tooltips and several popular
   // extensions change browser action icon in a loop.
   GtkWidget* image_;
 
   // Loads the button's icons for us on the file thread.
   ImageLoadingTracker tracker_;
 
   // If we are displaying a tab-specific icon, it will be here.
   GdkPixbuf* tab_specific_icon_;
 
+  // Icons loaded from paths.  Currently just the browser action's default icon.
+  ExtensionAction::PathToIconCache loaded_icons_;
+
   // If the browser action has a default icon, it will be here.
   GdkPixbuf* default_icon_;
 
   // Same as |default_icon_|, but stored as SkBitmap.
   SkBitmap default_skbitmap_;
 
   ui::GtkSignalRegistrar signals_;
   content::NotificationRegistrar registrar_;
 
   // The accelerator group used to handle accelerators, owned by this object.
@@ skipping 612 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }