Wrench Icon: Only animate low severity status once

chrome/browser/ui/toolbar/wrench_icon_painter.cc

 // Copyright (c) 2013 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/browser/ui/toolbar/wrench_icon_painter.h"
 
 #include "grit/theme_resources.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
@@ skipping 34 matching lines @@
     case UpgradeDetector::UPGRADE_ANNOYANCE_SEVERE:
       return SEVERITY_MEDIUM;
     case UpgradeDetector::UPGRADE_ANNOYANCE_CRITICAL:
       return SEVERITY_HIGH;
   }
   NOTREACHED();
   return SEVERITY_NONE;
 }
 
 // static
+bool WrenchIconPainter::ShouldAnimateUpgradeLevel(
+    UpgradeDetector::UpgradeNotificationAnnoyanceLevel level) {
+  bool should_animate = true;
+  if (level == UpgradeDetector::UPGRADE_ANNOYANCE_LOW) {
+    // Only animate low severity upgrades once.
+    static bool s_should_animate = true;

[sky, 2013/04/15 21:42:00]

s_should_animate -> should_animate

[sail, 2013/04/15 21:43:53]

Done.

+    should_animate = s_should_animate;
+    s_should_animate = false;
+  }
+  return should_animate;
+}
+
+// static
 WrenchIconPainter::Severity WrenchIconPainter::SeverityFromGlobalErrorSeverity(
     GlobalError::Severity severity) {
   switch (severity) {
     case GlobalError::SEVERITY_LOW:
       return SEVERITY_LOW;
     case GlobalError::SEVERITY_MEDIUM:
       return SEVERITY_MEDIUM;
     case GlobalError::SEVERITY_HIGH:
       return SEVERITY_HIGH;
   }
   NOTREACHED();
   return SEVERITY_LOW;
 }
 
 WrenchIconPainter::WrenchIconPainter(Delegate* delegate)
     : delegate_(delegate),
       severity_(SEVERITY_NONE) {
 }
 
 WrenchIconPainter::~WrenchIconPainter() {}
 
-void WrenchIconPainter::SetSeverity(Severity severity) {
+void WrenchIconPainter::SetSeverity(Severity severity, bool animate) {
   if (severity_ == severity)
     return;
 
   severity_ = severity;
   delegate_->ScheduleWrenchIconPaint();
   animation_.reset();
-  if (severity_ == SEVERITY_NONE)
+  if (severity_ == SEVERITY_NONE || !animate)
     return;
 
   ui::MultiAnimation::Parts parts;
   // Animate the bars left to right.
   parts.push_back(ui::MultiAnimation::Part(1300, ui::Tween::LINEAR));
   // Fade out animation.
   parts.push_back(ui::MultiAnimation::Part(1000, ui::Tween::EASE_IN));
   // Again, animate the bars left to right.
   parts.push_back(ui::MultiAnimation::Part(1300, ui::Tween::LINEAR));
 
@@ skipping 79 matching lines @@
     case SEVERITY_LOW:
       return IDR_TOOLS_BAR_LOW;
     case SEVERITY_MEDIUM:
       return IDR_TOOLS_BAR_MEDIUM;
     case SEVERITY_HIGH:
       return IDR_TOOLS_BAR_HIGH;
   }
   NOTREACHED();
   return 0;
 }