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 9db62bc1d38cccf88dee9237922739e7215db784..5e0aa5469f3c4f345119071084b644d992b0c138 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.cc
@@ -11,6 +11,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
@@ -50,10 +51,12 @@ AppMenuButton::AppMenuButton(ToolbarView* toolbar_view)
 
 AppMenuButton::~AppMenuButton() {}
 
-void AppMenuButton::SetSeverity(AppMenuIconPainter::Severity severity,
+void AppMenuButton::SetSeverity(AppMenuBadgeController::BadgeType type,
+                                AppMenuIconPainter::Severity severity,
                                 bool animate) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     severity_ = severity;
+    type_ = type;
     UpdateIcon();
     return;
   }
@@ -133,7 +136,9 @@ void AppMenuButton::ScheduleAppMenuIconPaint() {
 }
 
 void AppMenuButton::UpdateIcon() {
+  using BadgeType = AppMenuBadgeController::BadgeType;
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
+  gfx::VectorIconId icon_id = gfx::VectorIconId::BROWSER_TOOLS;
   SkColor color = gfx::kPlaceholderColor;
   switch (severity_) {
     case AppMenuIconPainter::SEVERITY_NONE:
@@ -151,8 +156,17 @@ void AppMenuButton::UpdateIcon() {
       break;
   }
 
+  if (severity_ != AppMenuIconPainter::SEVERITY_NONE) {

[Evan Stade, 2016/06/03 19:31:26]

why this check? Wouldn't type_ be NONE in this case?

Using a switch is preferred so the compiler will complain when a new, unhandled
type is added to the enum.

[kylix_rd, 2016/06/03 19:50:43]

The code was assuming that if the severity_ is NONE, then there would be no need
to select a different icon_id regardless of the type_ (it's set to BROWSER_TOOLS
above). IOW, it's a state that shouldn't happen. I could add a DCHECK() to the
BadgeType::NONE case to ensure this.
 
That's a very good point.

+    if (type_ == BadgeType::GLOBAL_ERROR)
+      icon_id = gfx::VectorIconId::UPDATE_MENU_FAILED;
+    else if (type_ == BadgeType::INCOMPATIBILITY_WARNING)
+      icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_WARNING;
+    else
+      icon_id = gfx::VectorIconId::UPDATE_MENU_SEVERITY_LOW_MEDIUM_HIGH;
+  }
+
   SetImage(views::Button::STATE_NORMAL,
-           gfx::CreateVectorIcon(gfx::VectorIconId::BROWSER_TOOLS, color));
+           gfx::CreateVectorIcon(icon_id, 16, color));
 }
 
 void AppMenuButton::SetTrailingMargin(int margin) {