Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4164)

Unified Diff: chrome/browser/extensions/script_badge_controller.cc

Issue 10559054: Animate the script badges. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move to extension action Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/script_badge_controller.cc
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index bb655a68b4414dbf29797014098f4f4cb9289dca..4970128394768a63199c90417654030d82848bd1 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -6,12 +6,12 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/extensions/extension_switch_utils.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
@@ -33,7 +33,7 @@ ScriptBadgeController::ScriptBadgeController(TabContents* tab_contents)
ScriptBadgeController::~ScriptBadgeController() {}
-std::vector<ExtensionAction*> ScriptBadgeController::GetCurrentActions() {
+std::vector<ExtensionAction*> ScriptBadgeController::GetCurrentActions() const {
return current_actions_;
}
@@ -168,11 +168,14 @@ bool ScriptBadgeController::InsertExtension(const std::string& extension_id) {
if (!extension)
return false;
- current_actions_.push_back(extension->script_badge());
+ ExtensionAction* script_badge = extension->script_badge();
+ current_actions_.push_back(script_badge);
+ script_badge->RunIconAnimation(
+ tab_contents_->extension_tab_helper()->tab_id());
+
return true;
}
-
bool ScriptBadgeController::EraseExtension(const Extension* extension) {
if (extensions_executing_scripts_.erase(extension->id()) == 0)
return false;

Powered by Google App Engine
This is Rietveld 408576698