Renamed AppMenuBadgeController to AppMenuIconController

chrome/browser/ui/toolbar/app_menu_icon_controller.cc

 // Copyright 2014 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.
 
-#include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
+#include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/upgrade_detector.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 29 matching lines @@
   bool should_animate = true;
   if (level == UpgradeDetector::UPGRADE_ANNOYANCE_LOW) {
     // Only animate low severity upgrades once.
     static bool should_animate_low_severity = true;
     should_animate = should_animate_low_severity;
     should_animate_low_severity = false;
   }
   return should_animate;
 }
 
-// Returns true if we should show the upgrade recommended badge.
+// Returns true if we should show the upgrade recommended icon.
 bool ShouldShowUpgradeRecommended() {
 #if defined(OS_CHROMEOS)
   // In chromeos, the update recommendation is shown in the system tray. So it
   // should not be displayed in the app menu.
   return false;
 #else
   return UpgradeDetector::GetInstance()->notify_upgrade();
 #endif
 }
 
 // Returns true if we should show the warning for incompatible software.
 bool ShouldShowIncompatibilityWarning() {
 #if defined(OS_WIN)
   EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
   loaded_modules->MaybePostScanningTask();
   return loaded_modules->ShouldShowConflictWarning();
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
-AppMenuBadgeController::AppMenuBadgeController(Profile* profile,
-                                               Delegate* delegate)
+AppMenuIconController::AppMenuIconController(Profile* profile,
+                                             Delegate* delegate)
     : profile_(profile), delegate_(delegate) {
   DCHECK(profile_);
   DCHECK(delegate_);
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(profile_));
 
 #if defined(OS_WIN)
-  if (base::win::GetVersion() == base::win::VERSION_XP) {
-    registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
-                   content::NotificationService::AllSources());
-  }

[kylix_rd, 2016/06/06 22:59:45]

Since we're removing XP/Vista specific code, I went ahead and got rid of this.

   registrar_.Add(this, chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE,
                  content::NotificationService::AllSources());
 #endif
 }
 
-AppMenuBadgeController::~AppMenuBadgeController() {
-}
+AppMenuIconController::~AppMenuIconController() {}
 
-void AppMenuBadgeController::UpdateDelegate() {
+void AppMenuIconController::UpdateDelegate() {
   if (ShouldShowUpgradeRecommended()) {
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
         UpgradeDetector::GetInstance()->upgrade_notification_stage();
-    delegate_->UpdateBadgeSeverity(BadgeType::UPGRADE_NOTIFICATION,
-                                   SeverityFromUpgradeLevel(level),
-                                   ShouldAnimateUpgradeLevel(level));
+    delegate_->UpdateIconSeverity(IconType::UPGRADE_NOTIFICATION,
+                                  SeverityFromUpgradeLevel(level),
+                                  ShouldAnimateUpgradeLevel(level));
     return;
   }
 
   if (ShouldShowIncompatibilityWarning()) {
-    delegate_->UpdateBadgeSeverity(BadgeType::INCOMPATIBILITY_WARNING,
-                                   AppMenuIconPainter::SEVERITY_MEDIUM, true);
+    delegate_->UpdateIconSeverity(IconType::INCOMPATIBILITY_WARNING,
+                                  AppMenuIconPainter::SEVERITY_MEDIUM, true);
     return;
   }
 
-  if (GlobalErrorServiceFactory::GetForProfile(profile_)->
-          GetHighestSeverityGlobalErrorWithAppMenuItem()) {
+  if (GlobalErrorServiceFactory::GetForProfile(profile_)
+          ->GetHighestSeverityGlobalErrorWithAppMenuItem()) {
     // If you change the severity here, make sure to also change the menu icon
     // and the bubble icon.
-    delegate_->UpdateBadgeSeverity(BadgeType::GLOBAL_ERROR,
-                                   AppMenuIconPainter::SEVERITY_MEDIUM, true);
+    delegate_->UpdateIconSeverity(IconType::GLOBAL_ERROR,
+                                  AppMenuIconPainter::SEVERITY_MEDIUM, true);
     return;
   }
 
-  delegate_->UpdateBadgeSeverity(BadgeType::NONE,
-                                 AppMenuIconPainter::SEVERITY_NONE, true);
+  delegate_->UpdateIconSeverity(IconType::NONE,
+                                AppMenuIconPainter::SEVERITY_NONE, true);
 }
 
-void AppMenuBadgeController::Observe(
+void AppMenuIconController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   UpdateDelegate();
 }