Renamed AppMenuBadgeController to AppMenuIconController

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

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 28 matching lines @@
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
 #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"
 #include "chrome/grit/generated_resources.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url_service.h"
@@ skipping 125 matching lines @@
 
  private:
   ToolbarController* observer_;  // weak, owns me
 
   DISALLOW_COPY_AND_ASSIGN(CommandObserverBridge);
 };
 
 // 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];
   }
 
   void OnPreferenceChanged(const std::string& pref_name) {
     [controller_ prefChanged:pref_name];
   }
 
  private:
   ToolbarController* controller_;  // weak, owns us
 
-  AppMenuBadgeController badge_controller_;
+  AppMenuIconController app_menu_icon_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationBridge);
 };
 
 }  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 @synthesize browser = browser_;
 
@@ skipping 197 matching lines @@
     ToolbarView* toolbarView = [self toolbarView];
     NSRect toolbarFrame = [toolbarView frame];
     if (toolbarFrame.size.height != toolbarHeight) {
       toolbarFrame.size.height = toolbarHeight;
       [toolbarView setFrame:toolbarFrame];
     }
   }
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
-  notificationBridge_->UpdateBadgeSeverity();
+  notificationBridge_->UpdateSeverity();
 
   [appMenuButton_ setOpenMenuOnClick:YES];
 
   [backButton_ setOpenMenuOnRightClick:YES];
   [forwardButton_ setOpenMenuOnRightClick:YES];
 
   [backButton_ setHandleMiddleClick:YES];
   [forwardButton_ setHandleMiddleClick:YES];
   [reloadButton_ setHandleMiddleClick:YES];
   [homeButton_ setHandleMiddleClick:YES];
@@ skipping 709 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end