Adding metrics logging for Simplified Gesture Navigation.

content/browser/web_contents/aura/gesture_nav_simple.cc

 // Copyright 2014 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 "content/browser/web_contents/aura/gesture_nav_simple.h"
 
 #include <utility>
 
 #include "base/macros.h"
+#include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "cc/paint/paint_flags.h"
 #include "components/vector_icons/vector_icons.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_delegate.h"
@@ skipping 53 matching lines @@
   return mode == (base::i18n::IsRTL() ? OVERSCROLL_EAST : OVERSCROLL_WEST) &&
          controller.CanGoForward();
 }
 
 bool ShouldNavigateBack(const NavigationController& controller,
                         OverscrollMode mode) {
   return mode == (base::i18n::IsRTL() ? OVERSCROLL_WEST : OVERSCROLL_EAST) &&
          controller.CanGoBack();
 }
 
+// Records UMA historgram and also user action for the cancelled overscroll.
+void RecordCancelled(NavigationDirection direction, OverscrollSource source) {
+  UMA_HISTOGRAM_ENUMERATION("Overscroll.Cancelled3",
+                            GetUmaNavigationType(direction, source),
+                            NAVIGATION_TYPE_COUNT);
+  if (direction == NavigationDirection::BACK)
+    RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Back"));
+  else
+    RecordAction(base::UserMetricsAction("Overscroll_Cancelled.Forward"));
+}
+
 }  // namespace
 
 // This class is responsible for creating, painting, and positioning the layer
 // for the gesture nav affordance.
 class Affordance : public ui::LayerDelegate, public gfx::AnimationDelegate {
  public:
   Affordance(GestureNavSimple* owner,
              OverscrollMode mode,
              const gfx::Rect& content_bounds);
   ~Affordance() override;
@@ skipping 291 matching lines @@
   return true;
 }
 
 void GestureNavSimple::OnOverscrollComplete(OverscrollMode overscroll_mode) {
   if (!affordance_ || affordance_->IsFinishing())
     return;
 
   CompleteGestureAnimation();
 
   NavigationControllerImpl& controller = web_contents_->GetController();
-  if (ShouldNavigateForward(controller, overscroll_mode))
+  bool navigated = false;
+  if (ShouldNavigateForward(controller, overscroll_mode)) {
     controller.GoForward();
-  else if (ShouldNavigateBack(controller, overscroll_mode))
+    navigated = true;
+  } else if (ShouldNavigateBack(controller, overscroll_mode)) {
     controller.GoBack();
+    navigated = true;
+  }
+
+  if (navigated) {
+    UMA_HISTOGRAM_ENUMERATION("Overscroll.Navigated3",
+                              GetUmaNavigationType(direction_, source_),
+                              UmaNavigationType::NAVIGATION_TYPE_COUNT);
+    if (direction_ == NavigationDirection::BACK)
+      RecordAction(base::UserMetricsAction("Overscroll_Navigated.Back"));
+    else
+      RecordAction(base::UserMetricsAction("Overscroll_Navigated.Forward"));
+  } else {
+    RecordCancelled(direction_, source_);
+  }
+
+  direction_ = NavigationDirection::NONE;
+  source_ = OverscrollSource::NONE;
 }
 
 void GestureNavSimple::OnOverscrollModeChange(OverscrollMode old_mode,
                                               OverscrollMode new_mode,
                                               OverscrollSource source) {
   NavigationControllerImpl& controller = web_contents_->GetController();
-  if (!ShouldNavigateForward(controller, new_mode) &&
-      !ShouldNavigateBack(controller, new_mode)) {
+  if (ShouldNavigateForward(controller, new_mode)) {
+    direction_ = NavigationDirection::FORWARD;
+  } else if (ShouldNavigateBack(controller, new_mode)) {
+    direction_ = NavigationDirection::BACK;
+  } else {
+    // If there is an overscoll in progress - record its cancellation.
+    if (direction_ != NavigationDirection::NONE)
+      RecordCancelled(direction_, source_);
+    direction_ = NavigationDirection::NONE;
+    source_ = OverscrollSource::NONE;
     AbortGestureAnimation();
     return;
   }
 
   DCHECK_NE(source, OverscrollSource::NONE);
+  source_ = source;
+
+  UMA_HISTOGRAM_ENUMERATION("Overscroll.Started3",
+                            GetUmaNavigationType(direction_, source_),
+                            UmaNavigationType::NAVIGATION_TYPE_COUNT);
+
   const float start_threshold = GetOverscrollConfig(
       source == OverscrollSource::TOUCHPAD
           ? OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHPAD
           : OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHSCREEN);
   const int width = source == OverscrollSource::TOUCHPAD
                         ? GetDisplaySize().width()
                         : GetVisibleSize().width();
   completion_threshold_ =
       width * GetOverscrollConfig(OVERSCROLL_CONFIG_HORIZ_THRESHOLD_COMPLETE) -
       start_threshold;
@@ skipping 12 matching lines @@
   parent->StackAtTop(affordance_->root_layer());
 }
 
 base::Optional<float> GestureNavSimple::GetMaxOverscrollDelta() const {
   if (affordance_)
     return completion_threshold_;
   return base::nullopt;
 }
 
 }  // namespace content