Implement new page action API.

chrome/browser/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2009 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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
@@ skipping 658 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarViewGtk::PageActionViewGtk
 
 LocationBarViewGtk::PageActionViewGtk::PageActionViewGtk(
     LocationBarViewGtk* owner, Profile* profile,
     const ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
-      page_action_(page_action) {
+      page_action_(page_action),
+      last_icon_skbitmap_(NULL),
+      last_icon_pixbuf_(NULL) {
   event_box_.Own(gtk_event_box_new());
   // Make the event box not visible so it does not paint a background.
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
   g_signal_connect(event_box_.get(), "button-press-event",
                    G_CALLBACK(&OnButtonPressed), this);
 
   image_.Own(gtk_image_new());
   gtk_container_add(GTK_CONTAINER(event_box_.get()), image_.get());
 
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
@@ skipping 12 matching lines @@
 
 LocationBarViewGtk::PageActionViewGtk::~PageActionViewGtk() {
   if (tracker_)
     tracker_->StopTrackingImageLoad();
   image_.Destroy();
   event_box_.Destroy();
   for (size_t i = 0; i < pixbufs_.size(); ++i) {
     if (pixbufs_[i])
       g_object_unref(pixbufs_[i]);
   }
+  if (last_icon_pixbuf_)
+    g_object_unref(last_icon_pixbuf_);
 }
 
 void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility(
     TabContents* contents, GURL url) {
   // Save this off so we can pass it back to the extension when the action gets
   // executed. See PageActionImageView::OnMousePressed.
   current_tab_id_ = ExtensionTabUtil::GetTabId(contents);
   current_url_ = url;
 
   const ExtensionActionState* state =
       contents->GetPageActionState(page_action_);
-  bool visible = state != NULL;
+  bool visible = state && !state->hidden();
   if (visible) {
     // Set the tooltip.
     if (state->title().empty())
       gtk_widget_set_tooltip_text(event_box_.get(),
                                   page_action_->title().c_str());
     else
       gtk_widget_set_tooltip_text(event_box_.get(), state->title().c_str());
+
     // Set the image.
-    int index = state->icon_index();
-    // The image index (if not within bounds) will be set to the first image.
-    if (index < 0 || index >= static_cast<int>(pixbufs_.size()))
-      index = 0;
+    SkBitmap* icon = state->icon();
+    GdkPixbuf* pixbuf = NULL;
+    if (icon) {
+      if (icon != last_icon_skbitmap_) {
+        if (last_icon_pixbuf_)
+          g_object_unref(last_icon_pixbuf_);
+        last_icon_skbitmap_ = icon;
+        last_icon_pixbuf_ = gfx::GdkPixbufFromSkBitmap(icon);
+      }
+      DCHECK(last_icon_pixbuf_);
+      pixbuf = last_icon_pixbuf_;
+    } else {
+      int index = state->icon_index();
+      // The image index (if not within bounds) will be set to the first image.
+      if (index < 0 || index >= static_cast<int>(pixbufs_.size()))
+        index = 0;
+      pixbuf = pixbufs_[index];
+    }
+
     // The pixbuf might not be loaded yet.
-    if (pixbufs_[index])
-      gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()), pixbufs_[index]);
+    if (pixbuf)
+      gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()), pixbuf);
     else
       visible = false;
   }
 
   if (visible) {
     gtk_widget_show_all(event_box_.get());
   } else {
     gtk_widget_hide_all(event_box_.get());
   }
 }
@@ skipping 14 matching lines @@
     LocationBarViewGtk::PageActionViewGtk* page_action_view) {
   ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
       page_action_view->profile_,
       page_action_view->page_action_->extension_id(),
       page_action_view->page_action_->id(),
       page_action_view->current_tab_id_,
       page_action_view->current_url_.spec(),
       event->button);
   return true;
 }