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/threading/thread_task_runner_handle.h"
 #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"
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ skipping 19 matching lines @@
       margin_trailing_(0),
       weak_factory_(this) {
   set_ink_drop_delegate(
       base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
   if (!ui::MaterialDesignController::IsModeMaterial())
     icon_painter_.reset(new AppMenuIconPainter(this));
 }
 
 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;
   }
 
   icon_painter_->SetSeverity(severity, animate);
   SchedulePaint();
 }
 
 void AppMenuButton::ShowMenu(bool for_drop) {
   if (menu_ && menu_->IsShowing())
@@ skipping 59 matching lines @@
 
   return ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
 }
 
 void AppMenuButton::ScheduleAppMenuIconPaint() {
   SchedulePaint();
 }
 
 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:
       color = GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
       break;
     case AppMenuIconPainter::SEVERITY_LOW:
       color = gfx::kGoogleGreen700;
       break;
     case AppMenuIconPainter::SEVERITY_MEDIUM:
       color = gfx::kGoogleYellow700;
       break;
     case AppMenuIconPainter::SEVERITY_HIGH:
       color = gfx::kGoogleRed700;
       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) {
   margin_trailing_ = margin;
 
   UpdateThemedBorder();
 
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     const int inset = LabelButton::kFocusRectInset;
     SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets(
@@ skipping 81 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);
 }