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

ash/system/chromeos/power/tray_power.h

Index: ash/system/chromeos/power/tray_power.h
===================================================================
--- ash/system/chromeos/power/tray_power.h	(revision 240507)
+++ ash/system/chromeos/power/tray_power.h	(working copy)
@@ -48,6 +48,17 @@
  private:
   friend class TrayPowerTest;
 
+  // This enum is used for histogram. The existing values should not be removed,
+  // and the new values should be added just before CHARGER_TYPE_COUNT.
+  enum ChargerType{
+    UNKNOWN_CHARGER,
+    MAINS_CHARGER,
+    USB_CHARGER,
+    UNCONFIRMED_SPRING_CHARGER,
+    SAFE_SPRING_CHARGER,
+    CHARGER_TYPE_COUNT,
+  };
+
   // Overridden from SystemTrayItem.
   virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
   virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
@@ -72,6 +83,9 @@
   bool UpdateNotificationStateForRemainingTime();
   bool UpdateNotificationStateForRemainingPercentage();
 
+  // Records the charger type in UMA.
+  void RecordChargerType();
+
   message_center::MessageCenter* message_center_;  // Not owned.
   tray::PowerTrayView* power_tray_;
   tray::PowerNotificationView* notification_view_;
@@ -81,6 +95,9 @@
   // called?
   bool usb_charger_was_connected_;
 
+  // Was line power connected the last time onPowerStatusChanged() was called?
+  bool line_power_was_connected_;
+
   DISALLOW_COPY_AND_ASSIGN(TrayPower);
 };