Chromium Code Reviews| Index: chrome/browser/ui/toolbar/wrench_icon_painter.cc |
| diff --git a/chrome/browser/ui/toolbar/wrench_icon_painter.cc b/chrome/browser/ui/toolbar/wrench_icon_painter.cc |
| index b3726637cddd6c556d1aa578b50c7813f81fd11e..b5e7a228fc78717788ae5f6e88e71d6b8aeb08be 100644 |
| --- a/chrome/browser/ui/toolbar/wrench_icon_painter.cc |
| +++ b/chrome/browser/ui/toolbar/wrench_icon_painter.cc |
| @@ -52,6 +52,19 @@ WrenchIconPainter::Severity WrenchIconPainter::SeverityFromUpgradeLevel( |
| } |
| // 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) { |
| @@ -73,14 +86,14 @@ WrenchIconPainter::WrenchIconPainter(Delegate* delegate) |
| 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; |