Integrate new MD update menu icons.

chrome/browser/ui/views/toolbar/app_menu_button.cc

Index: chrome/browser/ui/views/toolbar/app_menu_button.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.cc b/chrome/browser/ui/views/toolbar/app_menu_button.cc
index ca12f2f1d1dd190b9bbe03d43558d92d344fc758..d7133845905431fde65592ee5933e59c6357d2ca 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.cc
@@ -51,9 +51,11 @@ AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)
 AppMenuButton::~AppMenuButton() {}
 
 void AppMenuButton::SetSeverity(AppMenuIconPainter::Severity severity,
+                                AppMenuBadgeController::BadgeType type,
                                 bool animate) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     severity_ = severity;
+    type_ = type;
     UpdateIcon();
     return;
   }
@@ -134,6 +136,7 @@ void AppMenuButton::ScheduleAppMenuIconPaint() {
 
 void AppMenuButton::UpdateIcon() {
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
+  gfx::VectorIconId icon_id = gfx::VectorIconId::BROWSER_TOOLS;
   SkColor color = gfx::kPlaceholderColor;
   switch (severity_) {
     case AppMenuIconPainter::SEVERITY_NONE:
@@ -142,17 +145,26 @@ void AppMenuButton::UpdateIcon() {
       break;
     case AppMenuIconPainter::SEVERITY_LOW:
       color = gfx::kGoogleGreen700;
+      icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_LOW;
       break;
     case AppMenuIconPainter::SEVERITY_MEDIUM:
       color = gfx::kGoogleYellow700;
+      if (type_ == AppMenuBadgeController::BADGE_TYPE_GLOBAL_ERROR)
+        icon_id = gfx::VectorIconId::UPDATE_MENU_FAILED;
+      else if (type_ ==
+                AppMenuBadgeController::BADGE_TYPE_INCOMPATIBILITY_WARNING)

[Peter Kasting, 2016/05/11 19:16:46]

The long names for the enum values are causing strange indenting/wrapping here.

Maybe the BadgeType enum should be converted to an enum class, and then you can
use a type alias to pull that class into the local scope, so you can just do
things like "if (type_ == BadgeType::GLOBAL_ERROR)".

[kylix_rd, 2016/05/11 19:54:43]

Should this kind of refactoring work be a separate CL?

[Peter Kasting, 2016/05/11 19:57:48]

There's no formal rule, it's basically a judgment call.

This enum is used in few enough places that converting it would probably be
pretty simple, and I'd probably just do it in the same CL (assuming you want to
do it at all).  But doing it separately first would be OK too.

+        icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_WARNING;
+      else
+        icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_MEDIUM;
       break;
     case AppMenuIconPainter::SEVERITY_HIGH:
       color = gfx::kGoogleRed700;
+      icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_HIGH;
       break;
   }
 
   SetImage(views::Button::STATE_NORMAL,
-           gfx::CreateVectorIcon(gfx::VectorIconId::BROWSER_TOOLS, color));
+           gfx::CreateVectorIcon(icon_id, 16, color));
 }
 
 void AppMenuButton::SetTrailingMargin(int margin) {