Animate the script badges.

chrome/browser/ui/gtk/location_bar_view_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/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 713 matching lines @@
   // If there are no visible content things, hide the top level box so it
   // doesn't mess with padding.
   gtk_widget_set_visible(content_setting_hbox_.get(), any_visible);
 }
 
 void LocationBarViewGtk::UpdatePageActions() {
   std::vector<ExtensionAction*> new_page_actions;
 
   TabContents* tab_contents = GetTabContents();
   if (tab_contents) {
-    LocationBarController* controller =
+    LocationBarController* location_bar_controller =
         tab_contents->extension_tab_helper()->location_bar_controller();
-    new_page_actions = controller->GetCurrentActions();
+    new_page_actions = location_bar_controller->GetCurrentActions();
   }
 
   // Initialize on the first call, or re-initialize if more extensions have been
   // loaded or added after startup.
   if (new_page_actions != page_actions_) {
     page_actions_.swap(new_page_actions);
     page_action_views_.reset();
 
     for (size_t i = 0; i < page_actions_.size(); ++i) {
       page_action_views_.push_back(
@@ skipping 873 matching lines @@
 LocationBarViewGtk::PageActionViewGtk::PageActionViewGtk(
     LocationBarViewGtk* owner,
     ExtensionAction* page_action)
     : owner_(NULL),
       page_action_(page_action),
       last_icon_pixbuf_(NULL),
       tracker_(this),
       current_tab_id_(-1),
       window_(NULL),
       accel_group_(NULL),
-      preview_enabled_(false) {
+      preview_enabled_(false),
+      ALLOW_THIS_IN_INITIALIZER_LIST(scoped_icon_animation_observer_(
+          page_action->GetIconAnimation(
+              owner->GetTabContents()->extension_tab_helper()->tab_id()),
+          this)) {
   event_box_.Own(gtk_event_box_new());
   gtk_widget_set_size_request(event_box_.get(),
                               Extension::kPageActionIconMaxSize,
                               Extension::kPageActionIconMaxSize);
 
   // 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(&OnButtonPressedThunk), this);
   g_signal_connect_after(event_box_.get(), "expose-event",
@@ skipping 87 matching lines @@
       std::string icon_path = (icon_index < 0) ?
           page_action_->default_icon_path() :
           page_action_->icon_paths()->at(icon_index);
       if (!icon_path.empty()) {
         PixbufMap::iterator iter = pixbufs_.find(icon_path);
         if (iter != pixbufs_.end())
           pixbuf = iter->second;
       }
     }
     // The pixbuf might not be loaded yet.
-    if (pixbuf)
-      gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()), pixbuf);
+    if (pixbuf) {
+      const ExtensionAction::IconAnimation* icon_animation =
+          scoped_icon_animation_observer_.icon_animation();
+      if (icon_animation) {
+        // Draw |pixbuf| with the fade-in |icon_animation_| applied to it.
+        // Use a temporary gfx::Image to do the conversion to/from a SkBitmap.
+        g_object_ref(pixbuf);  // don't let gfx::Image take ownership.
+        gfx::Image animated_image(
+            icon_animation->Apply(*gfx::Image(pixbuf).ToSkBitmap()));
+        gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()),
+                                  animated_image.ToGdkPixbuf());
+      } else {
+        gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()), pixbuf);
+      }
+    }
   }
 
   bool old_visible = IsVisible();
   if (visible)
     gtk_widget_show_all(event_box_.get());
   else
     gtk_widget_hide_all(event_box_.get());
 
   if (visible != old_visible) {
     content::NotificationService::current()->Notify(
@@ skipping 18 matching lines @@
   // index greater than the number of icons, it must be the default icon.
   if (!image.IsEmpty()) {
     GdkPixbuf* pixbuf =
         static_cast<GdkPixbuf*>(g_object_ref(image.ToGdkPixbuf()));
     if (index < static_cast<int>(page_action_->icon_paths()->size()))
       pixbufs_[page_action_->icon_paths()->at(index)] = pixbuf;
     else
       pixbufs_[page_action_->default_icon_path()] = pixbuf;
   }
 
-  // If we have no owner, that means this class is still being constructed and
-  // we should not UpdatePageActions, since it leads to the PageActions being
-  // destroyed again and new ones recreated (causing an infinite loop).
-  if (owner_)
-    owner_->UpdatePageActions();
+  // If we have no owner, that means this class is still being constructed.
+  TabContents* tab_contents = owner_ ? owner_->GetTabContents() : NULL;
+  if (tab_contents)
+    UpdateVisibility(tab_contents->web_contents(), current_url_);
 }
 
 void LocationBarViewGtk::PageActionViewGtk::TestActivatePageAction() {
   GdkEventButton event = {};
   event.button = 1;
   OnButtonPressed(widget(), &event);
 }
 
 void LocationBarViewGtk::PageActionViewGtk::Observe(
     int type,
@@ skipping 43 matching lines @@
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
 
     // Since we've added an accelerator, we'll need to unregister it before
     // the window is closed, so we listen for the window being closed.
     registrar_.Add(this,
                    chrome::NOTIFICATION_WINDOW_CLOSED,
                    content::Source<GtkWindow>(window_));
   }
 }
 
+void LocationBarViewGtk::PageActionViewGtk::OnIconChanged(
+    const ExtensionAction::IconAnimation& animation) {
+  UpdateVisibility(owner_->GetWebContents(), current_url_);
+}
+
 void LocationBarViewGtk::PageActionViewGtk::DisconnectPageActionAccelerator() {
   if (accel_group_) {
     gtk_accel_group_disconnect_key(
         accel_group_,
         keybinding_.get()->GetGdkKeyCode(),
         static_cast<GdkModifierType>(keybinding_.get()->modifiers()));
     gtk_window_remove_accel_group(window_, accel_group_);
     g_object_unref(accel_group_);
     accel_group_ = NULL;
     keybinding_.reset(NULL);
@@ skipping 96 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }