Add User Actions and adding more details to UMA metrics for overscroll navigation

content/browser/web_contents/aura/overscroll_window_animation.cc

 // Copyright 2015 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/overscroll_window_animation.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/i18n/rtl.h"
@@ skipping 63 matching lines @@
 }
 
 void OverscrollWindowAnimation::OnImplicitAnimationsCompleted() {
   if (overscroll_cancelled_) {
     slide_window_.reset();
     delegate_->OnOverscrollCancelled();
     overscroll_cancelled_ = false;
   } else {
     delegate_->OnOverscrollCompleted(std::move(slide_window_));
   }
+  overscroll_source_ = OVERSCROLL_SOURCE_NONE;
   direction_ = SLIDE_NONE;
 }
 
 void OverscrollWindowAnimation::OnOverscrollModeChange(
     OverscrollMode old_mode,
-    OverscrollMode new_mode) {
+    OverscrollMode new_mode,
+    OverscrollSource source) {
   DCHECK_NE(old_mode, new_mode);
   Direction new_direction = GetDirectionForMode(new_mode);
   if (new_direction == SLIDE_NONE) {
     // The user cancelled the in progress animation.
     if (is_active())
       CancelSlide();
     return;
   }
   if (is_active()) {
     slide_window_->layer()->GetAnimator()->StopAnimating();
     delegate_->GetMainWindow()->layer()->GetAnimator()->StopAnimating();
   }
   gfx::Rect slide_window_bounds = gfx::Rect(GetVisibleBounds().size());
   if (new_direction == SLIDE_FRONT) {
     slide_window_bounds.Offset(base::i18n::IsRTL()
                                    ? -slide_window_bounds.width()
                                    : slide_window_bounds.width(),
                                0);
   } else {
     slide_window_bounds.Offset(base::i18n::IsRTL()
                                    ? slide_window_bounds.width() / 2
                                    : -slide_window_bounds.width() / 2,
                                0);
   }
+
+  DCHECK_EQ(overscroll_source_, OVERSCROLL_SOURCE_NONE);
+  overscroll_source_ = source;
   slide_window_ = new_direction == SLIDE_FRONT
                       ? delegate_->CreateFrontWindow(slide_window_bounds)
                       : delegate_->CreateBackWindow(slide_window_bounds);
   if (!slide_window_) {
     // Cannot navigate, do not start an overscroll gesture.
     direction_ = SLIDE_NONE;
+    overscroll_source_ = OVERSCROLL_SOURCE_NONE;
     return;
   }
   overscroll_cancelled_ = false;
   direction_ = new_direction;
   shadow_.reset(new ShadowLayerDelegate(GetFrontLayer()));
 }
 
 void OverscrollWindowAnimation::OnOverscrollComplete(
     OverscrollMode overscroll_mode) {
   if (!is_active())
@@ skipping 39 matching lines @@
 ui::Layer* OverscrollWindowAnimation::GetBackLayer() const {
   DCHECK(direction_ != SLIDE_NONE);
   if (direction_ == SLIDE_BACK) {
     DCHECK(slide_window_);
     return slide_window_->layer();
   }
   return delegate_->GetMainWindow()->layer();
 }
 
 }  // namespace content