Renamed AppMenuBadgeController to AppMenuIconController

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

Index: chrome/browser/ui/views/toolbar/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 122ea168ad6164a7637660289a3e53d2dafa6b04..9276225a57f2d36acd031bcc2dd2a619dacd56f8 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/command_observer.h"
-#include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
+#include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "components/prefs/pref_member.h"
@@ -42,7 +42,7 @@ class ToolbarView : public views::AccessiblePaneView,
                     public CommandObserver,
                     public views::ButtonListener,
                     public views::ViewTargeterDelegate,
-                    public AppMenuBadgeController::Delegate {
+                    public AppMenuIconController::Delegate {
  public:
   // The view class name.
   static const char kViewClassName[];
@@ -96,8 +96,8 @@ class ToolbarView : public views::AccessiblePaneView,
   LocationBarView* location_bar() const { return location_bar_; }
   AppMenuButton* app_menu_button() const { return app_menu_button_; }
   HomeButton* home_button() const { return home_; }
-  AppMenuBadgeController* app_menu_badge_controller() {
-    return &badge_controller_;
+  AppMenuIconController* app_menu_icon_controller() {
+    return &app_menu_icon_controller_;
   }
 
   // AccessiblePaneView:
@@ -164,10 +164,10 @@ class ToolbarView : public views::AccessiblePaneView,
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
-  // AppMenuBadgeController::Delegate:
-  void UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
-                           AppMenuIconPainter::Severity severity,
-                           bool animate) override;
+  // AppMenuIconController::Delegate:
+  void UpdateSeverity(AppMenuIconController::IconType type,
+                      AppMenuIconPainter::Severity severity,
+                      bool animate) override;
 
   // Used to avoid duplicating the near-identical logic of
   // ToolbarView::GetPreferredSize() and ToolbarView::GetMinimumSize(). These
@@ -208,7 +208,7 @@ class ToolbarView : public views::AccessiblePaneView,
 
   Browser* browser_;
 
-  AppMenuBadgeController badge_controller_;
+  AppMenuIconController app_menu_icon_controller_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;