| Index: ash/system/chromeos/power/power_status.cc
|
| diff --git a/ash/system/chromeos/power/power_status.cc b/ash/system/chromeos/power/power_status.cc
|
| index 57210f98077657398cb4d77944c5f922aad966c0..24d29d68b68a45797b09804e3dadcda2d08c5f67 100644
|
| --- a/ash/system/chromeos/power/power_status.cc
|
| +++ b/ash/system/chromeos/power/power_status.cc
|
| @@ -189,13 +189,8 @@ bool PowerStatus::IsUsbChargerConnected() const {
|
| }
|
|
|
| bool PowerStatus::IsOriginalSpringChargerConnected() const {
|
| - // Use the hard coded enum integer value for
|
| - // PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER
|
| - // in purpose of backport compatibility.
|
| - // TODO(jennyz): change this to use
|
| - // PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER on trunk
|
| - // after the change has been merged.
|
| - return proto_.external_power() == 3;
|
| + return proto_.external_power() == power_manager::
|
| + PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER;
|
| }
|
|
|
| gfx::ImageSkia PowerStatus::GetBatteryImage(IconSet icon_set) const {
|
|
|