Index: chrome/browser/ui/views/toolbar_view.cc |
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc |
index d7e9f70a37159722c1388e1494f3b6b0e9e78772..12603a7eb1316f7da5447f70fb6ef1398b1770d8 100644 |
--- a/chrome/browser/ui/views/toolbar_view.cc |
+++ b/chrome/browser/ui/views/toolbar_view.cc |
@@ -815,15 +815,17 @@ void ToolbarView::UpdateWrenchButtonSeverity() { |
incompatibility_badge_showing = false; |
if (ShouldShowUpgradeRecommended()) { |
- app_menu_->SetSeverity(WrenchIconPainter::SeverityFromUpgradeLevel( |
- UpgradeDetector::GetInstance()->upgrade_notification_stage())); |
+ UpgradeDetector::UpgradeNotificationAnnoyanceLevel level = |
+ UpgradeDetector::GetInstance()->upgrade_notification_stage(); |
+ app_menu_->SetSeverity(WrenchIconPainter::SeverityFromUpgradeLevel(level), |
+ WrenchIconPainter::ShouldAnimateUpgradeLevel(level)); |
return; |
} |
if (ShouldShowIncompatibilityWarning()) { |
if (!was_showing) |
content::RecordAction(UserMetricsAction("ConflictBadge")); |
- app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_HIGH); |
+ app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_HIGH, true); |
incompatibility_badge_showing = true; |
return; |
} |
@@ -834,11 +836,11 @@ void ToolbarView::UpdateWrenchButtonSeverity() { |
service->GetHighestSeverityGlobalErrorWithWrenchMenuItem(); |
if (error) { |
app_menu_->SetSeverity(WrenchIconPainter::SeverityFromGlobalErrorSeverity( |
- error->GetSeverity())); |
+ error->GetSeverity()), true); |
return; |
} |
- app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_NONE); |
+ app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_NONE, true); |
} |
void ToolbarView::OnShowHomeButtonChanged() { |