Merge 157903 - Turn off animations for page actions and browser actions.

chrome/common/extensions/extension_action.cc

Index: chrome/common/extensions/extension_action.cc
===================================================================
--- chrome/common/extensions/extension_action.cc	(revision 159746)
+++ chrome/common/extensions/extension_action.cc	(working copy)
@@ -319,9 +319,10 @@
 
   SetValue(&appearance_, tab_id, new_appearance);
 
-  // When showing a badge for the first time on a web page, fade it
-  // in.  Other transitions happen instantly.
-  if (old_appearance == INVISIBLE && tab_id != kDefaultTabId) {
+  // When showing a script badge for the first time on a web page, fade it in.
+  // Other transitions happen instantly.
+  if (old_appearance == INVISIBLE && tab_id != kDefaultTabId &&
+      action_type_ == TYPE_SCRIPT_BADGE) {
     RunIconAnimation(tab_id);
   }