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 1494ddb45114dca3faaf518ea1c3a89aa203d64f..d235d28bb3b8a07ba1ee62d7f9f03fe2939958a5 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -43383,6 +43383,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Overscroll.Cancelled" enum="NavigationDirection">
+  <obsolete>
+    Deprecated as of Chrome 59 in favour of Overscroll.Cancelled3.
+  </obsolete>
   <owner>rbyers@chromium.org</owner>
   <owner>mfomitchev@chromium.org</owner>
   <summary>
@@ -43390,25 +43393,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Overscroll.Completed" enum="OverscrollMode">
-  <obsolete>
-    Deprecated as of Chrome 44 in favour of Overscroll.Cancelled and
-    Overscroll.Navigated2.
-  </obsolete>
-  <owner>rbyers@chromium.org</owner>
+<histogram name="Overscroll.Cancelled3" enum="OverscrollNavigationType">
   <owner>mfomitchev@chromium.org</owner>
-  <summary>Completed overscroll gestures.</summary>
-  <details>
-    An overscroll gesture starts when user scrolls past the edge of the web page
-    and continues scrolling in the same direction. An overscroll gesture is
-    completed when user stops scrolling (e.g. by lifting the fingers from the
-    touchscreen or touchpad).
-  </details>
+  <summary>
+    Overscroll gestures that were aborted before they were completed.
+  </summary>
 </histogram>
 
-<histogram name="Overscroll.Navigated" enum="OverscrollMode">

[Steven Holte, 2017/02/25 01:33:27]

Don't delete the old histograms.

[mfomitchev, 2017/02/25 03:40:11]

Did you note that the histograms I am removing have been deprecated since Chrome
44? It's been almost two years, I thought it would be okay to get rid of them? I
guess it may be best to do it in a different CL either way, especially because
the diff looks confusing.

[Steven Holte, 2017/02/27 20:19:18]

I don't think we have any guidelines for when obsolete histograms are safe to
remove, but once we finally add some better handling for them we'll probably
just be removing all of them from this file, so I think it's simplest just to
leave them in for now.

+<histogram name="Overscroll.Navigated2" enum="NavigationDirection">
   <obsolete>
-    Deprecated as of Chrome 44 to switch to NavigationDirection enum.
+    Deprecated as of Chrome 59 in favour of Overscroll.Navigated3.
   </obsolete>
   <owner>rbyers@chromium.org</owner>
   <owner>mfomitchev@chromium.org</owner>
@@ -43418,8 +43412,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Overscroll.Navigated2" enum="NavigationDirection">
-  <owner>rbyers@chromium.org</owner>
+<histogram name="Overscroll.Navigated3" enum="OverscrollNavigationType">
   <owner>mfomitchev@chromium.org</owner>
   <summary>
     Navigations that were triggered due to completed overscroll gesture. Note
@@ -43427,24 +43420,23 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Overscroll.Started" enum="OverscrollMode">
+<histogram name="Overscroll.Started2" enum="NavigationDirection">
   <obsolete>
-    Deprecated as of Chrome 44 to switch to NavigationDirection enum.
+    Deprecated as of Chrome 59 in favour of Overscroll.Started3.
   </obsolete>
   <owner>rbyers@chromium.org</owner>
   <owner>mfomitchev@chromium.org</owner>
   <summary>
-    Overscroll gestures initiated by the user. Note that not all overcroll
+    Overscroll gestures initiated by the user. Note that not all overscroll
     gestures started are completed (e.g. the overscroll gesture is aborted if
     user clicks or presses a key during the gesture).
   </summary>
 </histogram>
 
-<histogram name="Overscroll.Started2" enum="NavigationDirection">
-  <owner>rbyers@chromium.org</owner>
+<histogram name="Overscroll.Started3" enum="OverscrollNavigationType">
   <owner>mfomitchev@chromium.org</owner>
   <summary>
-    Overscroll gestures initiated by the user. Note that not all overcroll
+    Overscroll gestures initiated by the user. Note that not all overscroll
     gestures started are completed (e.g. the overscroll gesture is aborted if
     user clicks or presses a key during the gesture).
   </summary>
@@ -99749,6 +99741,9 @@ value.
 </enum>
 
 <enum name="NavigationDirection" type="int">
+  <obsolete>
+    Deprecated as of Chrome 59 in favour of OverscrollNavigationType.
+  </obsolete>
   <summary>Direction of the overscroll gesture.</summary>
   <int value="0" label="None">Did not scroll</int>
   <int value="1" label="Forward">Scrolled forward</int>
@@ -101561,6 +101556,18 @@ value.
   <int value="4" label="East">Scrolled from left towards right</int>
 </enum>
 
+<enum name="OverscrollNavigationType" type="int">
+  <summary>
+    Type of the overscroll gesture based on direction and source   (i.e.
+    touchpad vs. touch screen).
+  </summary>
+  <int value="0" label="None">Did not scroll</int>
+  <int value="1" label="Forward">Scrolled forward using touchpad</int>
+  <int value="2" label="Back">Scrolled back using touchpad</int>
+  <int value="3" label="Forward">Scrolled forward using touch screen</int>
+  <int value="4" label="Back">Scrolled back using touch screen</int>
+</enum>
+
 <enum name="P2PLookupResult" type="int">
   <int value="0" label="Found"/>
   <int value="1" label="Not Found"/>