Remove a bunch of pre-MD toolbar code and assets.

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_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"
 #include "chrome/browser/win/enumerate_modules_model.h"
 #endif
 
 namespace {
 
 // Maps an upgrade level to a severity level.
-AppMenuIconPainter::Severity SeverityFromUpgradeLevel(
+AppMenuIconController::Severity SeverityFromUpgradeLevel(
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level) {
   switch (level) {
     case UpgradeDetector::UPGRADE_ANNOYANCE_NONE:
-      return AppMenuIconPainter::SEVERITY_NONE;
+      return AppMenuIconController::Severity::NONE;
     case UpgradeDetector::UPGRADE_ANNOYANCE_LOW:
-      return AppMenuIconPainter::SEVERITY_LOW;
+      return AppMenuIconController::Severity::LOW;
     case UpgradeDetector::UPGRADE_ANNOYANCE_ELEVATED:
-      return AppMenuIconPainter::SEVERITY_MEDIUM;
+      return AppMenuIconController::Severity::MEDIUM;
     case UpgradeDetector::UPGRADE_ANNOYANCE_HIGH:
-      return AppMenuIconPainter::SEVERITY_HIGH;
     case UpgradeDetector::UPGRADE_ANNOYANCE_SEVERE:
-      return AppMenuIconPainter::SEVERITY_HIGH;
     case UpgradeDetector::UPGRADE_ANNOYANCE_CRITICAL:
-      return AppMenuIconPainter::SEVERITY_HIGH;
+      return AppMenuIconController::Severity::HIGH;
   }
   NOTREACHED();
-  return AppMenuIconPainter::SEVERITY_NONE;
+  return AppMenuIconController::Severity::NONE;
 }
 
 // Checks if the app menu icon should be animated for the given upgrade level.
 bool ShouldAnimateUpgradeLevel(
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level) {
   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;
@@ skipping 53 matching lines @@
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
         UpgradeDetector::GetInstance()->upgrade_notification_stage();
     delegate_->UpdateSeverity(IconType::UPGRADE_NOTIFICATION,
                               SeverityFromUpgradeLevel(level),
                               ShouldAnimateUpgradeLevel(level));
     return;
   }
 
   if (ShouldShowIncompatibilityWarning()) {
     delegate_->UpdateSeverity(IconType::INCOMPATIBILITY_WARNING,
-                              AppMenuIconPainter::SEVERITY_MEDIUM, true);
+                              Severity::MEDIUM, true);
     return;
   }
 
   if (GlobalErrorServiceFactory::GetForProfile(profile_)
           ->GetHighestSeverityGlobalErrorWithAppMenuItem()) {
     // If you change the severity here, make sure to also change the menu icon
     // and the bubble icon.
     delegate_->UpdateSeverity(IconType::GLOBAL_ERROR,
-                              AppMenuIconPainter::SEVERITY_MEDIUM, true);
+                              Severity::MEDIUM, true);
     return;
   }
 
   delegate_->UpdateSeverity(IconType::NONE,
-                            AppMenuIconPainter::SEVERITY_NONE, true);
+                            Severity::NONE, true);
 }
 
 #if defined(OS_WIN)
 void AppMenuIconController::OnScanCompleted() {
   UpdateDelegate();
 }
 
 void AppMenuIconController::OnConflictsAcknowledged() {
   UpdateDelegate();
 }
 #endif
 
 void AppMenuIconController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   UpdateDelegate();
 }