Fix Ash.GestureCreated UMA histogram.

Previously there was an off-by-one error in the Ash.GestureCreated
histogram, which made it appear completely incorrectly. This fixes
that error, and adds the show press and tap cancel gestures.

BUG=326531

Review URL: https://codereview.chromium.org/110523002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239728 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc
index 29f6185..eec3512 100644
--- a/ash/touch/touch_uma.cc
+++ b/ash/touch/touch_uma.cc
@@ -55,8 +55,10 @@ enum UMAEventType {
   UMA_ET_GESTURE_PINCH_UPDATE_3,
   UMA_ET_GESTURE_PINCH_UPDATE_4P,
   UMA_ET_GESTURE_LONG_TAP,
+  UMA_ET_GESTURE_SHOW_PRESS,
+  UMA_ET_GESTURE_TAP_CANCEL,
   // NOTE: Add new event types only immediately above this line. Make sure to
-  // update the enum list in tools/histogram/histograms.xml accordingly.
+  // update the enum list in tools/metrics/histogram/histograms.xml accordingly.
   UMA_ET_COUNT
 };
 
@@ -157,6 +159,10 @@ UMAEventType UMAEventTypeFromEvent(const ui::Event& event) {
         return UMA_ET_GESTURE_MULTIFINGER_SWIPE_3;
       return UMA_ET_GESTURE_MULTIFINGER_SWIPE;
     }
+    case ui::ET_GESTURE_TAP_CANCEL:
+      return UMA_ET_GESTURE_TAP_CANCEL;
+    case ui::ET_GESTURE_SHOW_PRESS:
+      return UMA_ET_GESTURE_SHOW_PRESS;
     case ui::ET_SCROLL:
       return UMA_ET_SCROLL;
     case ui::ET_SCROLL_FLING_START:
@@ -164,6 +170,7 @@ UMAEventType UMAEventTypeFromEvent(const ui::Event& event) {
     case ui::ET_SCROLL_FLING_CANCEL:
       return UMA_ET_SCROLL_FLING_CANCEL;
     default:
+      NOTREACHED();
       return UMA_ET_UNKNOWN;
   }
 }