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 5f84acab589b5a01833a077269d67b967a632eef..50546d12adfb90324d3a1e60964f27dcae1c3ce6 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -28235,37 +28235,165 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
-<histogram name="Search.ContextualSearchOptCard"
-    enum="ContextualSearchOptCardAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <summary>The type of action taken in the Opt-in card.</summary>
+<histogram name="Search.ContextualSearchDurationSeen" units="milliseconds">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The time from initiating to ending a contextual search, when results were
+    seen as part of the search.
+  </summary>
 </histogram>
 
-<histogram name="Search.ContextualSearchOptPeekCard"
-    enum="ContextualSearchPeekCardAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <summary>The type of action taken when the Opt-in card is peeking.</summary>
+<histogram name="Search.ContextualSearchDurationUnseen" units="milliseconds">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The time from initiating to ending a contextual search, when results were
+    not seen as part of the search and the search did not end with the beginning
+    of another contextual search.
+  </summary>
 </histogram>
 
-<histogram name="Search.ContextualSearchPeekCard"
-    enum="ContextualSearchPeekCardAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <summary>The type of action taken when the Search card is peeking.</summary>
+<histogram name="Search.ContextualSearchDurationUnseenChained"
+    units="milliseconds">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The time from initiating to ending a contextual search, when results were
+    not seen as part of the search and the search ended with the beginning of
+    another contextual search.
+  </summary>
 </histogram>
 
-<histogram name="Search.ContextualSearchTap" enum="ContextualSearchTapAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <summary>The type of tap action taken by opted-in users.</summary>
+<histogram name="Search.ContextualSearchEnterClosed"
+    enum="ContextualSearchEnterClosedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (origin state and reason) of the first entry into the closed

[donnd, 2014/08/19 16:55:10]

Nit: "origin state" seems awkward, maybe just say "previous state" instead?

[manzagop (departed), 2014/08/19 17:45:58]

Done.

+    panel state within a contextual search.
+  </summary>
 </histogram>
 
-<histogram name="Search.ContextualSearchTapUndecided"
-    enum="ContextualSearchTapAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <summary>The type of tap action taken by undecided users.</summary>
+<histogram name="Search.ContextualSearchEnterExpanded"
+    enum="ContextualSearchEnterExpandedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (origin state and reason) of the first entry into the expanded
+    panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchEnterMaximized"
+    enum="ContextualSearchEnterMaximizedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (origin state and reason) of the first entry into the maximized
+    panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchEnterPeeked"
+    enum="ContextualSearchEnterPeekedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (origin state and reason) of the first entry into the peeked
+    panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchExitClosed"
+    enum="ContextualSearchExitClosedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (destination state and reason) of the first exit out of the
+    closed panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchExitExpanded"
+    enum="ContextualSearchExitExpandedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (destination state and reason) of the first exit out of the
+    expanded panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchExitMaximized"
+    enum="ContextualSearchExitMaximizedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (destination state and reason) of the first exit out of the
+    maximized panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchExitPeeked"
+    enum="ContextualSearchExitPeekedStateChange">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The details (destination state and reason) of the first exit out of the
+    peeked panel state within a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchFirstRunFlowOutcome"
+    enum="ContextualSearchPreferenceState">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The state of the Contextual Search Preference after exiting a contextual
+    search that started with the first run flow.

[donnd, 2014/08/19 16:55:10]

This is confusing to me because it sounds like it only logs the exit when the
user says yes, otherwise there wouldn't be a search.  But I would think we'd
want to log the state of the preference after the user made any decision to
opt-in or opt-out.

[manzagop (departed), 2014/08/19 17:45:58]

Done.

+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchPreferenceState"
+    enum="ContextualSearchPreferenceState">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The state of the Contextual Search Preference. Can be logged multiple times.

[donnd, 2014/08/19 16:55:10]

It's great that this can be logged multiple times!  I presume there's some
de-dupe logic?  I know it's not from this CL but can you explain how that works?

[manzagop (departed), 2014/08/19 17:45:58]

This is something that UMA provides (the number of users that appear in a given
histogram bin). I mention it here to ensure people looking at this know they
should use the "user" view, not the default raw event count view.

+    Used to determine the population size (user view).
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchPreferenceStateChange"
+    enum="ContextualSearchPreferenceState">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    The Contextual Search preference state after a modification from the the

[donnd, 2014/08/19 16:55:10]

Typo "the the"

[manzagop (departed), 2014/08/19 17:45:58]

Done.

+    preference menu.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchResultsSeen"
+    enum="ContextualSearchResultsSeen">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    Whether search results were seen as part of a contextual search.
+  </summary>
+</histogram>
+
+<histogram name="Search.ContextualSearchSelectionValid"
+    enum="ContextualSearchSelectionValid">
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>Whether a Contextual Search selection was valid.</summary>
 </histogram>
 
 <histogram name="Search.ContextualSearchTimeToSearch" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>manzagop@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
   <summary>The time between tapping on a word and performing a search.</summary>
 </histogram>
 
@@ -38306,26 +38434,110 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="4" label="SESSION_ONLY"/>
 </enum>
 
-<enum name="ContextualSearchOptCardAction" type="int">
-  <int value="0" label="Opt-in"/>
-  <int value="1" label="Opt-out"/>
-  <int value="2" label="Learn More"/>
-  <int value="3" label="Dismiss by Tapping on the Page"/>
-  <int value="4" label="Dismiss by Scrolling the Page"/>
-  <int value="5" label="Dismiss by Leaving the Page"/>
+<enum name="ContextualSearchEnterClosedStateChange" type="int">
+  <int value="0" label="From Other"/>
+  <int value="1" label="From Peeked (back press)"/>
+  <int value="2" label="From Peeked (base page scroll)"/>
+  <int value="3" label="From Peeked (text select tap)"/>
+  <int value="4" label="From Expanded (back press)"/>
+  <int value="5" label="From Expanded (base page tap)"/>
+  <int value="6" label="From Expanded (fling)"/>
+  <int value="7" label="From Maximized (back press)"/>
+  <int value="8" label="From Maximized (fling)"/>
+  <int value="9" label="From Maximized (tab promotion)"/>
+  <int value="10" label="From Maximized (SERP navigation)"/>
 </enum>
 
-<enum name="ContextualSearchPeekCardAction" type="int">
-  <int value="0" label="Tap Card"/>
-  <int value="1" label="Dismiss by Tapping on the Page"/>
-  <int value="2" label="Dismiss by Scrolling the Page"/>
-  <int value="3" label="Dismiss by Leaving the Page"/>
+<enum name="ContextualSearchEnterExpandedStateChange" type="int">
+  <int value="0" label="From Other"/>
+  <int value="1" label="From Peeked (search bar tap)"/>
+  <int value="2" label="From Peeked (swipe)"/>
+  <int value="3" label="From Peeked (fling)"/>
+  <int value="4" label="From Maximized (swipe)"/>
+  <int value="5" label="From Maximized (fling)"/>
 </enum>
 
-<enum name="ContextualSearchTapAction" type="int">
-  <int value="0" label="Tap Word"/>
-  <int value="1" label="Tap Ignored"/>
-  <int value="2" label="Tap Invalid"/>
+<enum name="ContextualSearchEnterMaximizedStateChange" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="From Peeked (swipe)"/>
+  <int value="2" label="From Peeked (fling)"/>
+  <int value="3" label="From Expanded (swipe)"/>
+  <int value="4" label="From Expanded (fling)"/>
+  <int value="5" label="From Expanded (SERP navigation)"/>
+</enum>
+
+<enum name="ContextualSearchEnterPeekedStateChange" type="int">
+  <int value="0" label="From Other"/>
+  <int value="1" label="From Closed (text select tap)"/>
+  <int value="2" label="From Closed (text select long press)"/>
+  <int value="3" label="From Peeked (text select tap)"/>
+  <int value="4" label="From Peeked (text select long press)"/>
+  <int value="5" label="From Expanded (search bar tap)"/>
+  <int value="6" label="From Expanded (swipe)"/>
+  <int value="7" label="From Expanded (fling)"/>
+  <int value="8" label="From Maximized (swipe)"/>
+  <int value="9" label="From Maximized (fling)"/>
+</enum>
+
+<enum name="ContextualSearchExitClosedStateChange" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="Peek (text select tap)"/>
+  <int value="2" label="Peek (text select long press)"/>
+</enum>
+
+<enum name="ContextualSearchExitExpandedStateChange" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="Close (back press)"/>
+  <int value="2" label="Close (base page tap)"/>
+  <int value="3" label="Close (fling)"/>
+  <int value="4" label="Peek (search bar tap)"/>
+  <int value="5" label="Peek (swipe)"/>
+  <int value="6" label="Peek (fling)"/>
+  <int value="7" label="Maximize (swipe)"/>
+  <int value="8" label="Maximize (fling)"/>
+  <int value="9" label="Maximize (SERP navigation)"/>
+</enum>
+
+<enum name="ContextualSearchExitMaximizedStateChange" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="Close (back press)"/>
+  <int value="2" label="Close (fling)"/>
+  <int value="3" label="Close (tab promotion)"/>
+  <int value="4" label="Close (SERP navigation)"/>
+  <int value="5" label="Peek (swipe)"/>
+  <int value="6" label="Peek (fling)"/>
+  <int value="7" label="Expand (swipe)"/>
+  <int value="8" label="Expand (fling)"/>
+</enum>
+
+<enum name="ContextualSearchExitPeekedStateChange" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="Close (back press)"/>
+  <int value="2" label="Close (base page scroll)"/>
+  <int value="3" label="Close (text select tap)"/>
+  <int value="4" label="Peek (text select tap)"/>
+  <int value="5" label="Peek (text select long press)"/>
+  <int value="6" label="Expand (search bar tap)"/>
+  <int value="7" label="Expand (swipe)"/>
+  <int value="8" label="Expand (fling)"/>
+  <int value="9" label="Maximize (swipe)"/>
+  <int value="10" label="To Maximize (fling)"/>
+</enum>
+
+<enum name="ContextualSearchPreferenceState" type="int">
+  <int value="0" label="Uninitialized"/>
+  <int value="1" label="Enabled"/>
+  <int value="2" label="Disabled"/>
+</enum>
+
+<enum name="ContextualSearchResultsSeen" type="int">
+  <int value="0" label="Seen"/>
+  <int value="1" label="Unseen"/>
+</enum>
+
+<enum name="ContextualSearchSelectionValid" type="int">
+  <int value="0" label="Valid"/>
+  <int value="1" label="Invalid"/>
 </enum>
 
 <enum name="CookieDeletionCause" type="int">
@@ -51423,18 +51635,6 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="PLT.LoadType"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ContextualSearch">
-  <suffix name="Control"/>
-  <suffix name="Tap"/>
-  <suffix name="TapForced"/>
-  <affected-histogram name="Search.ContextualSearchOptCard"/>
-  <affected-histogram name="Search.ContextualSearchOptPeekCard"/>
-  <affected-histogram name="Search.ContextualSearchPeekCard"/>
-  <affected-histogram name="Search.ContextualSearchTap"/>
-  <affected-histogram name="Search.ContextualSearchTapUndecided"/>
-  <affected-histogram name="Search.ContextualSearchTimeToSearch"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="CrosFirstRunStep" separator="">
   <suffix name="AppList"/>
   <suffix name="Tray"/>