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

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 301 matching lines @@
 }
 
 bool ExtensionAction::SetAppearance(int tab_id, Appearance new_appearance) {
   const Appearance old_appearance = GetValue(&appearance_, tab_id);
 
   if (old_appearance == new_appearance)
     return false;
 
   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);
   }
 
   return true;
 }
 
 void ExtensionAction::ClearAllValuesForTab(int tab_id) {
   popup_url_.erase(tab_id);
   title_.erase(tab_id);
   icon_.erase(tab_id);
@@ skipping 177 matching lines @@
   icon_animation->Start();
   // After the icon is finished fading in (plus some padding to handle random
   // timer delays), destroy it. We use a delayed task so that the Animation is
   // deleted even if it hasn't finished by the time the MessageLoop is
   // destroyed.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DestroyIconAnimation, base::Passed(icon_animation.Pass())),
       base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2));
 }