Implementing the dispatch of the swipe gesture for one-finger touch swipes.

ash/touch/touch_uma.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/touch/touch_uma.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
@@ skipping 26 matching lines @@
   UMA_ET_GESTURE_TAP_DOWN,
   UMA_ET_GESTURE_BEGIN,
   UMA_ET_GESTURE_END,
   UMA_ET_GESTURE_DOUBLE_TAP,
   UMA_ET_GESTURE_TRIPLE_TAP,
   UMA_ET_GESTURE_TWO_FINGER_TAP,
   UMA_ET_GESTURE_PINCH_BEGIN,
   UMA_ET_GESTURE_PINCH_END,
   UMA_ET_GESTURE_PINCH_UPDATE,
   UMA_ET_GESTURE_LONG_PRESS,
-  UMA_ET_GESTURE_MULTIFINGER_SWIPE,
+  UMA_ET_GESTURE_MULTIFINGER_SWIPE_2,

[sky, 2014/05/27 17:27:54]

Document what this and swipe 1 is.

[sky, 2014/05/27 17:27:54]

Can you move all the UMA_ET_GESTURE_MULTIFINGER_SWIPE together?

[Alexei Svitkine (slow), 2014/05/27 17:29:12]

If this is used in UMA enum histograms (which it looks like), it's incorrect to
renumber them.

[sky, 2014/05/27 17:36:33]

Bummer. If that is the case we should have that warning at the top and I think
explicit values make it even clearer.

[mfomitchev, 2014/05/27 18:33:43]

Done.

[mfomitchev, 2014/05/27 18:33:43]

Done.

   UMA_ET_SCROLL,
   UMA_ET_SCROLL_FLING_START,
   UMA_ET_SCROLL_FLING_CANCEL,
   UMA_ET_GESTURE_MULTIFINGER_SWIPE_3,
   UMA_ET_GESTURE_MULTIFINGER_SWIPE_4P,  // 4+ fingers
   UMA_ET_GESTURE_SCROLL_UPDATE_2,
   UMA_ET_GESTURE_SCROLL_UPDATE_3,
   UMA_ET_GESTURE_SCROLL_UPDATE_4P,
   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,
   UMA_ET_GESTURE_WIN8_EDGE_SWIPE,
+  UMA_ET_GESTURE_MULTIFINGER_SWIPE_1,
   // NOTE: Add new event types only immediately above this line. Make sure to
   // update the UIEventType enum in tools/metrics/histograms/histograms.xml
   // accordingly.
   UMA_ET_COUNT
 };
 
 struct WindowTouchDetails {
   WindowTouchDetails()
       : max_distance_from_start_squared_(0) {
   }
@@ skipping 34 matching lines @@
       return UMA_ET_TOUCH_MOVED;
     case ui::ET_TOUCH_CANCELLED:
       return UMA_ET_TOUCH_CANCELLED;
     case ui::ET_GESTURE_SCROLL_BEGIN:
       return UMA_ET_GESTURE_SCROLL_BEGIN;
     case ui::ET_GESTURE_SCROLL_END:
       return UMA_ET_GESTURE_SCROLL_END;
     case ui::ET_GESTURE_SCROLL_UPDATE: {
       const ui::GestureEvent& gesture =
           static_cast<const ui::GestureEvent&>(event);
-      if (gesture.details().touch_points() >= 4)
-        return UMA_ET_GESTURE_SCROLL_UPDATE_4P;
+      if (gesture.details().touch_points() == 1)
+        return UMA_ET_GESTURE_SCROLL_UPDATE;
+      else if (gesture.details().touch_points() == 2)
+        return UMA_ET_GESTURE_SCROLL_UPDATE_2;
       else if (gesture.details().touch_points() == 3)
         return UMA_ET_GESTURE_SCROLL_UPDATE_3;
-      else if (gesture.details().touch_points() == 2)
-        return UMA_ET_GESTURE_SCROLL_UPDATE_2;
-      return UMA_ET_GESTURE_SCROLL_UPDATE;
+      return UMA_ET_GESTURE_SCROLL_UPDATE_4P;

[tdresser, 2014/05/27 12:07:31]

Thanks for catching this case - I think this does read a somewhat nicer.

     }
     case ui::ET_GESTURE_TAP: {
       const ui::GestureEvent& gesture =
           static_cast<const ui::GestureEvent&>(event);
       int tap_count = gesture.details().tap_count();
       if (tap_count == 1)
         return UMA_ET_GESTURE_TAP;
       if (tap_count == 2)
         return UMA_ET_GESTURE_DOUBLE_TAP;
       if (tap_count == 3)
@@ skipping 19 matching lines @@
       if (gesture.details().touch_points() >= 4)
         return UMA_ET_GESTURE_PINCH_UPDATE_4P;
       else if (gesture.details().touch_points() == 3)
         return UMA_ET_GESTURE_PINCH_UPDATE_3;
       return UMA_ET_GESTURE_PINCH_UPDATE;
     }
     case ui::ET_GESTURE_LONG_PRESS:
       return UMA_ET_GESTURE_LONG_PRESS;
     case ui::ET_GESTURE_LONG_TAP:
       return UMA_ET_GESTURE_LONG_TAP;
-    case ui::ET_GESTURE_MULTIFINGER_SWIPE: {
+    case ui::ET_GESTURE_SWIPE: {
       const ui::GestureEvent& gesture =
           static_cast<const ui::GestureEvent&>(event);
-      if (gesture.details().touch_points() >= 4)
-        return UMA_ET_GESTURE_MULTIFINGER_SWIPE_4P;
+      if (gesture.details().touch_points() == 1)
+        return UMA_ET_GESTURE_MULTIFINGER_SWIPE_1;
+      else if (gesture.details().touch_points() == 2)
+        return UMA_ET_GESTURE_MULTIFINGER_SWIPE_2;
       else if (gesture.details().touch_points() == 3)
         return UMA_ET_GESTURE_MULTIFINGER_SWIPE_3;
-      return UMA_ET_GESTURE_MULTIFINGER_SWIPE;
+      return UMA_ET_GESTURE_MULTIFINGER_SWIPE_4P;
     }
     case ui::ET_GESTURE_WIN8_EDGE_SWIPE:
       return UMA_ET_GESTURE_WIN8_EDGE_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:
@@ skipping 283 matching lines @@
       return GESTURE_OMNIBOX_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_OMNIBOX_PINCH;
     return GESTURE_UNKNOWN;
   }
 
   return GESTURE_UNKNOWN;
 }
 
 }  // namespace ash