Integrate new MD update menu icons.

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

Index: chrome/browser/ui/views/toolbar/app_menu_button.h
diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.h b/chrome/browser/ui/views/toolbar/app_menu_button.h
index 5705f34b18040354b7d8df4a94e053441a14f94d..f1c0647e74d86c811ffcb277a5b487de27dd164b 100644
--- a/chrome/browser/ui/views/toolbar/app_menu_button.h
+++ b/chrome/browser/ui/views/toolbar/app_menu_button.h
@@ -9,6 +9,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
 #include "chrome/browser/ui/toolbar/app_menu_icon_painter.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
@@ -31,7 +32,9 @@ class AppMenuButton : public views::MenuButton,
   explicit AppMenuButton(ToolbarView* toolbar_view);
   ~AppMenuButton() override;
 
-  void SetSeverity(AppMenuIconPainter::Severity severity, bool animate);
+  void SetSeverity(AppMenuIconPainter::Severity severity,
+                   AppMenuBadgeController::BadgeType type,

[Evan Stade, 2016/06/03 18:58:14]

nit: can we match the param ordering of ToolbarView::UpdateBadgeSeverity

[kylix_rd, 2016/06/03 19:27:14]

Done.

+                   bool animate);
 
   // Shows the app menu. |for_drop| indicates whether the menu is opened for a
   // drag-and-drop operation.
@@ -91,6 +94,7 @@ class AppMenuButton : public views::MenuButton,
 
   // Only used in MD.
   AppMenuIconPainter::Severity severity_;
+  AppMenuBadgeController::BadgeType type_;
 
   // Our owning toolbar view.
   ToolbarView* toolbar_view_;