Index: chrome/browser/ui/gtk/location_bar_view_gtk.h |
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h |
index 90557d94c96d32e458a3400139de5de147123cfb..aef919a3b304b2e10f97d063f7c513f33acea4bd 100644 |
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h |
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h |
@@ -27,6 +27,7 @@ |
#include "chrome/browser/ui/view_ids.h" |
#include "chrome/browser/ui/zoom/zoom_controller.h" |
#include "chrome/common/content_settings_types.h" |
+#include "chrome/common/extensions/extension_action.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/common/page_transition_types.h" |
@@ -230,9 +231,11 @@ class LocationBarViewGtk : public OmniboxEditController, |
DISALLOW_COPY_AND_ASSIGN(ContentSettingImageViewGtk); |
}; |
- class PageActionViewGtk : public ImageLoadingTracker::Observer, |
- public content::NotificationObserver, |
- public ExtensionContextMenuModel::PopupDelegate { |
+ class PageActionViewGtk : |
+ public ImageLoadingTracker::Observer, |
+ public content::NotificationObserver, |
+ public ExtensionContextMenuModel::PopupDelegate, |
+ public ExtensionAction::IconAnimation::Observer { |
public: |
PageActionViewGtk(LocationBarViewGtk* owner, ExtensionAction* page_action); |
virtual ~PageActionViewGtk(); |
@@ -289,6 +292,10 @@ class LocationBarViewGtk : public OmniboxEditController, |
GdkModifierType modifier, |
void* user_data); |
+ // ExtensionAction::IconAnimationDelegate implementation. |
+ virtual void OnIconChanged( |
+ const ExtensionAction::IconAnimation& animation) OVERRIDE; |
+ |
// The location bar view that owns us. |
LocationBarViewGtk* owner_; |
@@ -340,6 +347,10 @@ class LocationBarViewGtk : public OmniboxEditController, |
scoped_ptr<MenuGtk> context_menu_; |
scoped_refptr<ExtensionContextMenuModel> context_menu_model_; |
+ // Fade-in animation for the icon with observer scoped to this. |
+ ExtensionAction::IconAnimation::ScopedObserver |
+ scoped_icon_animation_observer_; |
+ |
DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk); |
}; |
friend class PageActionViewGtk; |