retry cd95e0083676d5e: Remove some pre-md code and assets.

ash/common/system/chromeos/power/power_status.h

 // Copyright (c) 2013 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 ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/gfx/image/image_skia.h"
 
+namespace gfx {
+struct VectorIcon;
+}
+
 namespace ash {
 
 // PowerStatus is a singleton that receives updates about the system's
 // power status from chromeos::PowerManagerClient and makes the information
 // available to interested classes within Ash.
 class ASH_EXPORT PowerStatus : public chromeos::PowerManagerClient::Observer {
  public:
-  // Types of badges which can be drawn on top of a battery icon.
-  enum IconBadge {
-    ICON_BADGE_NONE,
-    ICON_BADGE_ALERT,
-    ICON_BADGE_BOLT,
-    ICON_BADGE_X,
-    ICON_BADGE_UNRELIABLE
-  };
-
   // Different styles of battery icons.
   enum IconSet { ICON_LIGHT, ICON_DARK };
 
   // Interface for classes that wish to be notified when the power status
   // has changed.
   class Observer {
    public:
     // Called when the power status changes.
     virtual void OnPowerStatusChanged() = 0;
 
@@ skipping 20 matching lines @@
 
     // Message ID of a description for this port.
     int description_id;
   };
 
   // Information about the battery image corresponding to the status at a given
   // point in time. This can be cached and later compared to avoid unnecessarily
   // updating onscreen icons (GetBatteryImage() creates a new image on each
   // call).
   struct BatteryImageInfo {
-    BatteryImageInfo()
-        : resource_id(-1),
-          offset(-1),
-          index(-1),
-          icon_badge(ICON_BADGE_NONE),
-          charge_level(-1) {}
+    BatteryImageInfo() : icon_badge(nullptr), charge_level(-1) {}
 
     bool operator==(const BatteryImageInfo& o) const;
 
     bool operator!=(const BatteryImageInfo& o) const { return !(*this == o); }
 
-    // Resource ID of the image containing the specific battery icon to use.
-    // Only used in non-MD.
-    int resource_id;
+    // The badge (lightning bolt, exclamation mark, etc) that should be drawn
+    // on top of the battery icon.
+    const gfx::VectorIcon* icon_badge;
 
-    // Horizontal offset in the battery icon array image. The USB / "unreliable
-    // charging" image has a single column of icons; the other image contains a
-    // "battery" column on the left and a "line power" column on the right.
-    // Only used in non-MD.
-    int offset;
-
-    // Vertical offset corresponding to the current battery level. Only used in
-    // non-MD.
-    int index;
-
-    // The badge (lightning bolt, exclamation mark, etc) that should be drawn
-    // on top of the battery icon. Only used for MD.
-    // TODO(tdanderson): Consider using gfx::VectorIconId instead of this enum
-    // once all possible badges have been vectorized. See crbug.com/617298.
-    IconBadge icon_badge;
-
-    // A value between 0 and kBatteryImageHeightMD representing the height
-    // of the battery's charge level in dp. Only used for MD.
+    // A value between 0 and kBatteryImageHeight representing the height
+    // of the battery's charge level in dp.
     int charge_level;
   };
 
   // Maximum battery time-to-full or time-to-empty that should be displayed
   // in the UI. If the current is close to zero, battery time estimates can
   // get very large; avoid displaying these large numbers.
   static const int kMaxBatteryTimeToDisplaySec;
 
-  // An alert badge is drawn over the material design battery icon if the
-  // battery is not connected to a charger and has less than
-  // |kCriticalBatteryChargePercentageMd| percentage of charge remaining.
-  static const double kCriticalBatteryChargePercentageMd;
+  // An alert badge is drawn over the battery icon if the battery is not
+  // connected to a charger and has less than |kCriticalBatteryChargePercentage|
+  // percentage of charge remaining.
+  static const double kCriticalBatteryChargePercentage;
 
   // Sets the global instance. Must be called before any calls to Get().
   static void Initialize();
 
   // Destroys the global instance.
   static void Shutdown();
 
   // Returns true if the global instance is initialized.
   static bool IsInitialized();
 
@@ skipping 82 matching lines @@
 
   // Returns the ID of the currently used power source, or an empty string if no
   // power source is selected.
   std::string GetCurrentPowerSourceID() const;
 
   // Returns information about the image that would be returned by
   // GetBatteryImage(). This can be cached and compared against future objects
   // returned by this method to avoid creating new images unnecessarily.
   BatteryImageInfo GetBatteryImageInfo(IconSet icon_set) const;
 
-  // A helper function called by GetBatteryImageInfo(). Populates the
-  // MD-specific fields of |info|.
-  void CalculateBatteryImageInfoMd(BatteryImageInfo* info) const;
-
-  // A helper function called by GetBatteryImageInfo(). Populates the
-  // non-MD-specific fields of |info|.
-  void CalculateBatteryImageInfoNonMd(BatteryImageInfo* info,
-                                      const IconSet& icon_set) const;
+  // A helper function called by GetBatteryImageInfo(). Populates the fields of
+  // |info|.
+  void CalculateBatteryImageInfo(BatteryImageInfo* info) const;
 
   // Creates a new image that should be shown for the battery's current state.
   gfx::ImageSkia GetBatteryImage(const BatteryImageInfo& info) const;
 
-  // A version of GetBatteryImage() that is used when material design is not
-  // enabled.
-  // TODO(tdanderson): Remove this once material design is enabled by default.
-  // See crbug.com/614453.
-  gfx::ImageSkia GetBatteryImageNonMd(const BatteryImageInfo& info) const;
-
   // Returns an string describing the current state for accessibility.
   base::string16 GetAccessibleNameString(bool full_description) const;
 
   // Updates |proto_|. Does not notify observers.
   void SetProtoForTesting(const power_manager::PowerSupplyProperties& proto);
 
  protected:
   PowerStatus();
   ~PowerStatus() override;
 
  private:
   // Overriden from PowerManagerClient::Observer.
   void PowerChanged(const power_manager::PowerSupplyProperties& proto) override;
 
   base::ObserverList<Observer> observers_;
 
   // Current state.
   power_manager::PowerSupplyProperties proto_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerStatus);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_