Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2705)

Unified Diff: chrome/browser/ui/views/toolbar/app_menu_button.h

Issue 1966643002: Integrate new MD update menu icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed indent Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..e88eef2953633b8983e3feb19117f294598db3d8 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(AppMenuBadgeController::BadgeType type,
+ AppMenuIconPainter::Severity severity,
+ 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_;

Powered by Google App Engine
This is Rietveld 408576698