ash: Add UMA for taps on webpage, bezel and tabstrip.

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/shell_delegate.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "ui/aura/root_window.h"
@@ skipping 12 matching lines @@
   GESTURE_UNKNOWN,
   GESTURE_OMNIBOX_PINCH,
   GESTURE_OMNIBOX_SCROLL,
   GESTURE_TABSTRIP_PINCH,
   GESTURE_TABSTRIP_SCROLL,
   GESTURE_BEZEL_SCROLL,
   GESTURE_DESKTOP_SCROLL,
   GESTURE_DESKTOP_PINCH,
   GESTURE_WEBPAGE_PINCH,
   GESTURE_WEBPAGE_SCROLL,
+  GESTURE_WEBPAGE_TAP,
+  GESTURE_TABSTRIP_TAP,
+  GESTURE_BEZEL_DOWN,
 // NOTE: Add new action types only immediately above this line. Also, make sure
 // the enum list in tools/histogram/histograms.xml is updated with any change in
 // here.
   GESTURE_ACTION_COUNT
 };
 
 enum UMAEventType {
   UMA_ET_UNKNOWN,
   UMA_ET_TOUCH_RELEASED,
   UMA_ET_TOUCH_PRESSED,
@@ skipping 48 matching lines @@
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTouchDetails,
                                  kWindowTouchDetails,
                                  NULL);
 
 GestureActionType FindGestureActionType(aura::Window* window,
                                         const ui::GestureEvent& event) {
   if (!window || window->GetRootWindow() == window) {
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
       return GESTURE_BEZEL_SCROLL;
+    if (event.type() == ui::ET_GESTURE_BEGIN)
+      return GESTURE_BEZEL_DOWN;
     return GESTURE_UNKNOWN;
   }
 
   std::string name = window ? window->name() : std::string();
 
   const char kDesktopBackgroundView[] = "DesktopBackgroundView";
   if (name == kDesktopBackgroundView) {
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
       return GESTURE_DESKTOP_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_DESKTOP_PINCH;
     return GESTURE_UNKNOWN;
   }
 
   const char kWebPage[] = "RenderWidgetHostViewAura";
   if (name == kWebPage) {
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_WEBPAGE_PINCH;
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
       return GESTURE_WEBPAGE_SCROLL;
+    if (event.type() == ui::ET_GESTURE_TAP)
+      return GESTURE_WEBPAGE_TAP;
     return GESTURE_UNKNOWN;
   }
 
   views::Widget* widget = views::Widget::GetWidgetForNativeView(window);
   if (!widget)
     return GESTURE_UNKNOWN;
 
   views::View* view = widget->GetRootView()->
       GetEventHandlerForPoint(event.location());
   if (!view)
     return GESTURE_UNKNOWN;
 
   name = view->GetClassName();
 
   const char kTabStrip[] = "TabStrip";
   const char kTab[] = "BrowserTab";
   if (name == kTabStrip || name == kTab) {
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
       return GESTURE_TABSTRIP_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_TABSTRIP_PINCH;
+    if (event.type() == ui::ET_GESTURE_TAP)
+      return GESTURE_TABSTRIP_TAP;
     return GESTURE_UNKNOWN;
   }
 
   const char kOmnibox[] = "BrowserOmniboxViewViews";
   if (name == kOmnibox) {
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN)
       return GESTURE_OMNIBOX_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_OMNIBOX_PINCH;
     return GESTURE_UNKNOWN;
@@ skipping 114 matching lines @@
       static_cast<int>(std::max(event.radius_x(), event.radius_y())),
       1, 500, 100);
 
   WindowTouchDetails* details = target->GetProperty(kWindowTouchDetails);
   if (!details) {
     details = new WindowTouchDetails;
     target->SetProperty(kWindowTouchDetails, details);
   }
 
   // Record the location of the touch points.
-  const int kBucketCount = 100;
+  const int kBucketCountForLocation = 100;
   const gfx::Rect bounds = target->GetRootWindow()->bounds();
-  const int bucket_size_x = bounds.width() / kBucketCount;
-  const int bucket_size_y = bounds.height() / kBucketCount;
+  const int bucket_size_x = bounds.width() / kBucketCountForLocation;
+  const int bucket_size_y = bounds.height() / kBucketCountForLocation;
 
   gfx::Point position = event.root_location();
 
   // Prefer raw event location (when available) over calibrated location.
   if (event.HasNativeEvent()) {
 #if defined(USE_XI2_MT)
     XEvent* xevent = event.native_event();
     CHECK_EQ(GenericEvent, xevent->type);
     XIEvent* xievent = static_cast<XIEvent*>(xevent->xcookie.data);
     if (xievent->evtype == XI_TouchBegin ||
         xievent->evtype == XI_TouchUpdate ||
         xievent->evtype == XI_TouchEnd) {
       XIDeviceEvent* device_event =
           static_cast<XIDeviceEvent*>(xevent->xcookie.data);
       position.SetPoint(static_cast<int>(device_event->event_x),
                         static_cast<int>(device_event->event_y));
     } else {
       position = ui::EventLocationFromNative(event.native_event());
     }
 #else
     position = ui::EventLocationFromNative(event.native_event());
 #endif
+    position = position.Scale(1. / target->layer()->device_scale_factor());

[Ilya Sherman, 2012/08/14 18:54:01]

nit: I'm not 100% sure of this, but I think Chromium code generally prefers
"1.0" to "1."

[sadrul, 2012/08/14 19:57:05]

It looks like we use "1." in other places in the code.

   }
 
   position.set_x(std::min(bounds.width() - 1, std::max(0, position.x())));
   position.set_y(std::min(bounds.height() - 1, std::max(0, position.y())));
 
-  STATIC_HISTOGRAM_POINTER_BLOCK("Ash.TouchPositionX",
-      Add(position.x() / bucket_size_x),
-      base::LinearHistogram::FactoryGet("Ash.TouchPositionX", 1, kBucketCount,
-          kBucketCount + 1, base::Histogram::kUmaTargetedHistogramFlag));
-  STATIC_HISTOGRAM_POINTER_BLOCK("Ash.TouchPositionY",
-      Add(position.y() / bucket_size_y),
-      base::LinearHistogram::FactoryGet("Ash.TouchPositionY", 1, kBucketCount,
-          kBucketCount + 1, base::Histogram::kUmaTargetedHistogramFlag));
+  UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionX",
+      position.x() / bucket_size_x,
+      0, kBucketCountForLocation, kBucketCountForLocation + 1);
+  UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionY",
+      position.y() / bucket_size_y,
+      0, kBucketCountForLocation, kBucketCountForLocation + 1);
 
   if (event.type() == ui::ET_TOUCH_PRESSED) {
     Shell::GetInstance()->delegate()->RecordUserMetricsAction(
         UMA_TOUCHSCREEN_TAP_DOWN);
 
     details->last_start_time_[event.touch_id()] = event.time_stamp();
     details->last_touch_position_[event.touch_id()] = event.location();
 
     if (details->last_release_time_.ToInternalValue()) {
       // Measuring the interval between a touch-release and the next
       // touch-start is probably less useful when doing multi-touch (e.g.
       // gestures, or multi-touch friendly apps). So count this only if the user
       // hasn't done any multi-touch during the last 30 seconds.
       base::TimeDelta diff = event.time_stamp() - details->last_mt_time_;
       if (diff.InSeconds() > 30) {
         base::TimeDelta gap = event.time_stamp() - details->last_release_time_;
         UMA_HISTOGRAM_COUNTS_10000("Ash.TouchStartAfterEnd",
             gap.InMilliseconds());
       }
     }
 
     // Record the number of touch-points currently active for the window.
     const int kMaxTouchPoints = 10;
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.ActiveTouchPoints",
-        std::min(static_cast<int>(details->last_start_time_.size()),
-                 kMaxTouchPoints),
-        1, kMaxTouchPoints, kMaxTouchPoints);
+        details->last_start_time_.size(),
+        1, kMaxTouchPoints, kMaxTouchPoints + 1);

[Ilya Sherman, 2012/08/14 18:54:01]

Note that this change will probably cause one of the bucket ranges to be
different between this version and the current uploads (from Canary builds?). 
That's probably ok since the histogram hasn't been around very long, and 10
touch points is pretty unlikely itself.  But, if you want to make sure that the
data from older versions doesn't cloud your analysis, you'll need to be careful
to only select appropriate versions on the dashboard, or just rename this
histogram so that there's no mixing of data.

[sadrul, 2012/08/14 19:57:05]

Thanks for the heads-up. I think at this point, this is still new enough that
this won't be an issue. rbyers@, would you agree? Or should we rename the
histogram as isherman@ suggests?

   } else if (event.type() == ui::ET_TOUCH_RELEASED) {
     if (details->last_start_time_.count(event.touch_id())) {
       base::TimeDelta duration = event.time_stamp() -
                                  details->last_start_time_[event.touch_id()];
       UMA_HISTOGRAM_COUNTS_100("Ash.TouchDuration", duration.InMilliseconds());
     }
     details->last_start_time_.erase(event.touch_id());
     details->last_move_time_.erase(event.touch_id());
     details->last_touch_position_.erase(event.touch_id());
     details->last_release_time_ = event.time_stamp();
@@ skipping 14 matching lines @@
 
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchMoveSteps", distance, 1, 1000, 50);
 
     details->last_move_time_[event.touch_id()] = event.time_stamp();
     details->last_touch_position_[event.touch_id()] = event.location();
   }
 }
 
 }  // namespace internal
 }  // namespace ash