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 65d16025996f576bbbcd682f0b53093959a19207..3076e0e9439acc1b24c61dda5ea00b6fc653da35 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -4743,6 +4743,34 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="EasyUnlock.ClickedButton" enum="EasyUnlockButton">
+  <owner>joshwoodward@google.com</owner>
+  <summary>Button clicked in easy unlock app during setup process.</summary>
+</histogram>
+
+<histogram name="EasyUnlock.NotificationEvent"
+    enum="EasyUnlockNotificationEvent">
+  <owner>joshwoodward@google.com</owner>
+  <summary>
+    Tracks events related to notifications used by easy unlock feature. For
+    example a specific easy unlock notification being shown or clicked.
+  </summary>
+</histogram>
+
+<histogram name="EasyUnlock.SetupStateOnClose" enum="EasyUnlockSetupState">
+  <owner>joshwoodward@google.com</owner>
+  <summary>
+    State easy unlock setup was in when the app window was closed by user.
+  </summary>
+</histogram>
+
+<histogram name="EasyUnlock.UnlockEvent" enum="EasyUnlockUnlockEvent">
+  <owner>joshwoodward@google.com</owner>
+  <summary>
+    Screen unlock events detected while easy unlock was enabled.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.AutoEnrollmentExtraTime" units="milliseconds">
   <owner>joaodasilva@chromium.org</owner>
   <summary>
@@ -32899,6 +32927,36 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="4" label="TTLS"/>
 </enum>
 
+<enum name="EasyUnlockButton" type="int">
+  <int value="0" label="FIND_DEVICE"/>
+  <int value="1" label="PAIR_DEVICE"/>
+  <int value="2" label="TRY_OUT_EASY_UNLOCK"/>
+  <int value="3" label="ENABLE_EASY_UNLOCK"/>
+  <int value="4" label="DISABLE_EASY_UNLOCK"/>
+</enum>
+
+<enum name="EasyUnlockNotificationEvent" type="int">
+  <int value="0" label="SET_UP_SHOWN"/>
+  <int value="1" label="SET_UP_CLICKED"/>
+  <int value="2" label="TRY_OUT_SHOWN"/>
+  <int value="3" label="TRY_OUT_CLICKED"/>
+</enum>
+
+<enum name="EasyUnlockSetupState" type="int">
+  <int value="0" label="SUCCESS"/>
+  <int value="1" label="SCAN_INITIAL"/>
+  <int value="2" label="SCAN_IN_PROGRESS"/>
+  <int value="3" label="SCAN_ERROR"/>
+  <int value="4" label="PAIRING_INITIAL"/>
+  <int value="5" label="PAIRING_IN_PROGRESS"/>
+  <int value="6" label="PAIRING_ERROR"/>

[Ilya Sherman, 2014/05/23 15:26:54]

Note that you can use human-friendly names for all of the labels in this file,
not just the specific two that I explicitly commented on.

[tbarzic, 2014/05/23 16:57:01]

Done.

+</enum>
+
+<enum name="EasyUnlockUnlockEvent" type="int">
+  <int value="0" label="Screen unlocked (total)"/>
+  <int value="1" label="Screen unlocked (via EasyUnlock)"/>
+</enum>
+
 <enum name="EnterpriseCheckError" type="int">
   <int value="0" label="Cound not get net join info."/>
   <int value="1" label="Cound not bind to domain controller."/>