Index: chrome/browser/extensions/script_badge_controller.h |
diff --git a/chrome/browser/extensions/script_badge_controller.h b/chrome/browser/extensions/script_badge_controller.h |
index 420e666bb244abce072d5fae13a76985bb557f5a..84b212de56643d707c6d12b6d6f8e932932a69c1 100644 |
--- a/chrome/browser/extensions/script_badge_controller.h |
+++ b/chrome/browser/extensions/script_badge_controller.h |
@@ -56,7 +56,9 @@ class ScriptBadgeController |
explicit ScriptBadgeController(TabContents* tab_contents); |
// LocationBarController implementation. |
- virtual std::vector<ExtensionAction*> GetCurrentActions() OVERRIDE; |
+ virtual std::vector<ExtensionAction*> GetCurrentActions() const OVERRIDE; |
+ virtual base::WeakPtr<IconAnimation> GetIconAnimation( |
+ const ExtensionAction* action) const OVERRIDE; |
virtual Action OnClicked(const std::string& extension_id, |
int mouse_button) OVERRIDE; |
@@ -125,6 +127,12 @@ class ScriptBadgeController |
// The extensions that have called ExecuteScript on the current frame. |
std::set<std::string> extensions_executing_scripts_; |
+ // Active animations for each ExtensionAction (keyed by extension ID). |
Yoyo Zhou
2012/06/22 00:50:29
Have you considered storing these on the Extension
not at google - send to devlin
2012/06/26 07:30:47
Done. Ended up being simpler to put it on Extensio
|
+ class IconAnimationWrapper; |
+ typedef std::map<std::string, linked_ptr<IconAnimationWrapper> > |
+ IconAnimationMap; |
+ IconAnimationMap icon_animations_; |
+ |
// Listen to extension unloaded notifications. |
content::NotificationRegistrar registrar_; |