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

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
===================================================================
--- tools/metrics/histograms/histograms.xml	(revision 240507)
+++ tools/metrics/histograms/histograms.xml	(working copy)
@@ -12377,6 +12377,14 @@
   </summary>
 </histogram>
 
+<histogram name="Power.ChargerType" enum="PowerChargerType">
+  <summary>
+    External power supply type such as MAINS_CHARGER, USB_CHARGER,
+    UNCONFIRMED_SPRING_CHARGER, SAFE_SPRING_CHARGER. A sample is reported each
+    time a charger is connected to the device.
+  </summary>
+</histogram>
+
 <histogram name="Power.FirmwareResumeTimeOnAC" units="milliseconds">
   <summary>
     The time that the firmware took to resume the Chrome OS device from
@@ -24492,6 +24500,14 @@
   <int value="2" label="Brightness Absolute"/>
 </enum>
 
+<enum name="PowerChargerType" type="int">
+  <int value="0" label="Unknown charger"/>
+  <int value="1" label="MAINS charger"/>
+  <int value="2" label="USB Charger"/>
+  <int value="3" label="Unconfirmed Spring Charger"/>
+  <int value="4" label="Safe Spring Charger"/>
+</enum>
+
 <enum name="PreconnectedNavigation" type="int">
   <int value="0" label="No recent pre-connect to the page"/>
   <int value="1" label="Page nav. preceded by a pre-connect"/>