Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

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>
 
@@ skipping 10 matching lines @@
 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:
-  // 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;
 
    protected:
     virtual ~Observer() {}
   };
@@ skipping 141 matching lines @@
   // Returns a list of available power sources which the user may select.
   std::vector<PowerSource> GetPowerSources() const;
 
   // 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;
+  BatteryImageInfo GetBatteryImageInfo() const;
 
   // A helper function called by GetBatteryImageInfo(). Populates the fields of
   // |info|.
   void CalculateBatteryImageInfo(BatteryImageInfo* info) const;
 
+  // The size of the image GetBatteryImage will return, in DIP.
+  static gfx::Size GetBatteryImageSizeInDip();
+
   // Creates a new image that should be shown for the battery's current state.
-  gfx::ImageSkia GetBatteryImage(const BatteryImageInfo& info) const;
+  gfx::ImageSkiaRep GetBatteryImage(const BatteryImageInfo& info,
+                                    float scale) 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_