Integrate new MD update menu icons.

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

 // Copyright 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/views/toolbar/app_menu_button.h"
 
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 33 matching lines @@
       ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)),
       weak_factory_(this) {
   set_ink_drop_delegate(ink_drop_delegate_.get());
   if (!ui::MaterialDesignController::IsModeMaterial())
     icon_painter_.reset(new AppMenuIconPainter(this));
 }
 
 AppMenuButton::~AppMenuButton() {}
 
 void AppMenuButton::SetSeverity(AppMenuIconPainter::Severity severity,
+                                AppMenuBadgeController::BadgeType type,
                                 bool animate) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     severity_ = severity;
+    type_ = type;
     UpdateIcon();
     return;
   }
 
   icon_painter_->SetSeverity(severity, animate);
   SchedulePaint();
 }
 
 void AppMenuButton::ShowMenu(bool for_drop) {
   if (menu_ && menu_->IsShowing())
@@ skipping 60 matching lines @@
   return ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
 }
 
 void AppMenuButton::ScheduleAppMenuIconPaint() {
   SchedulePaint();
 }
 
 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:
       color = GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
       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) {
   margin_trailing_ = margin;
 
   UpdateThemedBorder();
 
   const int inset = LabelButton::kFocusRectInset;
   SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets(
       gfx::Insets(inset, inset, inset, inset + margin)));
@@ skipping 78 matching lines @@
   views::MenuButton::OnPaint(canvas);
   if (ui::MaterialDesignController::IsModeMaterial())
     return;
   // Use GetPreferredSize() to center the icon inside the visible bounds rather
   // than the whole size() (which may refer to hit test region extended to the
   // end of the toolbar in maximized mode).
   icon_painter_->Paint(canvas, GetThemeProvider(),
                        gfx::Rect(GetPreferredSize()),
                        AppMenuIconPainter::BEZEL_NONE);
 }