Merge 240486 "Implement the spring charger replacement UI and ad..."

ash/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_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/observer_list.h"
@@ skipping 102 matching lines @@
   // Returns true if line power (including a charger of any type) is connected.
   bool IsLinePowerConnected() const;
 
   // Returns true if an official, non-USB charger is connected.
   bool IsMainsChargerConnected() const;
 
   // Returns true if a USB charger (which is likely to only support a low
   // charging rate) is connected.
   bool IsUsbChargerConnected() const;
 
+  // Returns true if an original spring charger is connected.
+  bool IsOriginalSpringChargerConnected() const;
+
   // Returns the image that should be shown for the battery's current state.
   gfx::ImageSkia GetBatteryImage(IconSet icon_set) const;
 
   // Returns an string describing the current state for accessibility.
   base::string16 GetAccessibleNameString() const;
 
   // Updates |proto_|. Does not notify observers.
   void SetProtoForTesting(const power_manager::PowerSupplyProperties& proto);
 
  protected:
@@ skipping 10 matching lines @@
   // Current state.
   power_manager::PowerSupplyProperties proto_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerStatus);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_