Integrate new MD update menu icons.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_
 
 #include <memory>
 
 #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"
 #include "ui/views/view.h"
 
 class AppMenu;
 class AppMenuModel;
 
 namespace views {
 class InkDropDelegate;
 class LabelButtonBorder;
 class MenuListener;
 }
 
 class ToolbarView;
 
 class AppMenuButton : public views::MenuButton,
                       public AppMenuIconPainter::Delegate {
  public:
   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.
   void ShowMenu(bool for_drop);
 
   // Closes the app menu, if it's open.
   void CloseMenu();
 
   AppMenu* app_menu_for_testing() { return menu_.get(); }
 
@@ skipping 39 matching lines @@
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
   int OnPerformDrop(const ui::DropTargetEvent& event) override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // Only used in pre-MD.
   std::unique_ptr<AppMenuIconPainter> icon_painter_;
 
   // Only used in MD.
   AppMenuIconPainter::Severity severity_;
+  AppMenuBadgeController::BadgeType type_;
 
   // Our owning toolbar view.
   ToolbarView* toolbar_view_;
 
   // Whether or not we should allow dragging extension icons onto this button
   // (in order to open the overflow in the app menu).
   bool allow_extension_dragging_;
 
   // Listeners to call when the menu opens.
   base::ObserverList<views::MenuListener> menu_listeners_;
 
   // App model and menu.
   // Note that the menu should be destroyed before the model it uses, so the
   // menu should be listed later.
   std::unique_ptr<AppMenuModel> menu_model_;
   std::unique_ptr<AppMenu> menu_;
 
   // Any trailing margin to be applied. Used when the browser is in
   // a maximized state to extend to the full window width.
   int margin_trailing_;
 
   // Used to spawn weak pointers for delayed tasks to open the overflow menu.
   base::WeakPtrFactory<AppMenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppMenuButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_