Merge 247397 "chromeos: Avoid notification for original Spring c..."

ash/system/chromeos/power/power_status.cc

 // 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.
 
 #include "ash/system/chromeos/power/power_status.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/shell.h"
@@ skipping 171 matching lines @@
   return proto_.external_power() ==
       power_manager::PowerSupplyProperties_ExternalPower_AC;
 }
 
 bool PowerStatus::IsUsbChargerConnected() const {
   return proto_.external_power() ==
       power_manager::PowerSupplyProperties_ExternalPower_USB;
 }
 
 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 {
   gfx::Image all;
   if (IsUsbChargerConnected()) {
     all = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         icon_set == ICON_DARK ?
         IDR_AURA_UBER_TRAY_POWER_SMALL_CHARGING_UNRELIABLE_DARK :
         IDR_AURA_UBER_TRAY_POWER_SMALL_CHARGING_UNRELIABLE);
   } else {
@@ skipping 88 matching lines @@
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());
 }
 
 }  // namespace internal
 }  // namespace ash