Renamed AppMenuBadgeController to AppMenuIconController

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index ddd366370c8733fa8558cae1b695d189c1e5a81d..f6d97883a0032f8cb26ba55207156d17a7dbfac2 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -46,7 +46,7 @@
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.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/app_menu_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
@@ -192,21 +192,18 @@ class CommandObserverBridge : public CommandObserver {
 // A class registered for C++ notifications. This is used to detect changes in
 // preferences and upgrade available notifications. Bridges the notification
 // back to the ToolbarController.
-class NotificationBridge : public AppMenuBadgeController::Delegate {
+class NotificationBridge : public AppMenuIconController::Delegate {
  public:
   explicit NotificationBridge(ToolbarController* controller)
       : controller_(controller),
-        badge_controller_([controller browser]->profile(), this) {
-  }
+        app_menu_icon_controller_([controller browser]->profile(), this) {}
   ~NotificationBridge() override {}
 
-  void UpdateBadgeSeverity() {
-    badge_controller_.UpdateDelegate();
-  }
+  void UpdateSeverity() { app_menu_icon_controller_.UpdateDelegate(); }
 
-  void UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
-                           AppMenuIconPainter::Severity severity,
-                           bool animate) override {
+  void UpdateSeverity(AppMenuIconController::IconType type,
+                      AppMenuIconPainter::Severity severity,
+                      bool animate) override {
     [controller_ updateAppMenuButtonSeverity:severity animate:animate];
   }
 
@@ -217,7 +214,7 @@ class NotificationBridge : public AppMenuBadgeController::Delegate {
  private:
   ToolbarController* controller_;  // weak, owns us
 
-  AppMenuBadgeController badge_controller_;
+  AppMenuIconController app_menu_icon_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationBridge);
 };
@@ -435,7 +432,7 @@ class NotificationBridge : public AppMenuBadgeController::Delegate {
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
-  notificationBridge_->UpdateBadgeSeverity();
+  notificationBridge_->UpdateSeverity();
 
   [appMenuButton_ setOpenMenuOnClick:YES];