Simplify a method in UpgradeDetector.

chrome/browser/upgrade_detector.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_H_
 #define CHROME_BROWSER_UPGRADE_DETECTOR_H_
 
 #include "base/timer/timer.h"
 #include "chrome/browser/idle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 15 matching lines @@
   // The Homeland Security Upgrade Advisory System.
   enum UpgradeNotificationAnnoyanceLevel {
     UPGRADE_ANNOYANCE_NONE = 0,  // What? Me worry?
     UPGRADE_ANNOYANCE_LOW,       // Green.
     UPGRADE_ANNOYANCE_ELEVATED,  // Yellow.
     UPGRADE_ANNOYANCE_HIGH,      // Red.
     UPGRADE_ANNOYANCE_SEVERE,    // Orange.
     UPGRADE_ANNOYANCE_CRITICAL,  // Red exclamation mark.
   };
 
-  // The two types of icons we know about.
-  enum UpgradeNotificationIconType {
-    UPGRADE_ICON_TYPE_BADGE = 0,  // For overlay badging of the wrench menu.
-    UPGRADE_ICON_TYPE_MENU_ICON,  // For showing in the wrench menu.
-  };
-
   // Returns the singleton implementation instance.
   static UpgradeDetector* GetInstance();
 
   virtual ~UpgradeDetector();
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Whether the user should be notified about an upgrade.
   bool notify_upgrade() const { return notify_upgrade_; }
 
@@ skipping 19 matching lines @@
     return critical_update_acknowledged_;
   }
 
   // When the last upgrade was detected.
   const base::Time& upgrade_detected_time() const {
     return upgrade_detected_time_;
   }
 
   // Retrieves the right icon ID based on the degree of severity (see
   // UpgradeNotificationAnnoyanceLevel, each level has an an accompanying icon
-  // to go with it). |type| determines which class of icons the caller wants,
-  // either an icon appropriate for badging the wrench menu or one to display
-  // within the wrench menu.
-  int GetIconResourceID(UpgradeNotificationIconType type);
+  // to go with it) to display within the wrench menu.
+  int GetIconResourceID();
 
   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage() const {
     return upgrade_notification_stage_;
   }
 
  protected:
   UpgradeDetector();
 
   // Sends out UPGRADE_DETECTED notification and record upgrade_detected_time_.
   void NotifyUpgradeDetected();
@@ skipping 44 matching lines @@
   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_;
 
   // Whether we have waited long enough after detecting an upgrade (to see
   // is we should start nagging about upgrading).
   bool notify_upgrade_;
 
   DISALLOW_COPY_AND_ASSIGN(UpgradeDetector);
 };
 
 #endif  // CHROME_BROWSER_UPGRADE_DETECTOR_H_