tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index dfffacb45bdd60d1861f900ef9a604d56547fd69..b1abc08c17791a7613958028c2135e3f9858b4e9 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -48398,6 +48398,36 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Power.PowerSupplyMaxPower" units="W">
+  <owner>bleung@chromium.org</owner>
+  <owner>derat@chromium.org</owner>
+  <summary>
+    The maximum power supported by the connected power supply on Chrome OS. A
+    sample is reported every time that the power manager polls sysfs (typically
+    every 30 seconds) and sees a connected supply.
+  </summary>
+</histogram>
+
+<histogram name="Power.PowerSupplyMaxVoltage" units="V">
+  <owner>bleung@chromium.org</owner>
+  <owner>derat@chromium.org</owner>
+  <summary>
+    The maximum voltage supported by the connected power supply on Chrome OS. A
+    sample is reported every time that the power manager polls sysfs (typically
+    every 30 seconds) and sees a connected supply.
+  </summary>
+</histogram>
+
+<histogram name="Power.PowerSupplyType" enum="PowerSupplyType">
+  <owner>bleung@chromium.org</owner>
+  <owner>derat@chromium.org</owner>
+  <summary>
+    The type of the connected power supply on Chrome OS. A sample is reported
+    every time that the power manager polls sysfs (typically every 30 seconds)
+    and sees a connected supply.
+  </summary>
+</histogram>
+
 <histogram name="Power.RetrySuspendCount">
   <obsolete>
     Deprecated Feb 2014 by Power.SuspendAttemptsBeforeCancel and
@@ -99111,6 +99141,9 @@ value.
 </enum>
 
 <enum name="PowerChargerType" type="int">
+  <obsolete>
+    Deprecated 11/2014 in issue 427057.
+  </obsolete>
   <int value="0" label="Unknown charger"/>
   <int value="1" label="MAINS charger"/>
   <int value="2" label="USB Charger"/>
@@ -99118,6 +99151,22 @@ value.
   <int value="4" label="Safe Spring Charger"/>
 </enum>
 
+<enum name="PowerSupplyType" type="int">
+  <summary>
+    The type of power supply connected to a Chrome OS system, as reported by the
+    kernel.
+  </summary>
+  <int value="0" label="Other"/>
+  <int value="1" label="Mains"/>
+  <int value="2" label="USB"/>
+  <int value="3" label="USB_ACA"/>
+  <int value="4" label="USB_CDP"/>
+  <int value="5" label="USB_DCP"/>
+  <int value="6" label="USB_C"/>
+  <int value="7" label="USB_PD"/>
+  <int value="8" label="USB_PD_DRP"/>
+</enum>
+
 <enum name="PowerwashDialogViewType" type="int">
   <int value="0" label="Invoked on settings page"/>
   <int value="1" label="Shortcut. Confirmation for powerwash only."/>