[Contextual Search] Add support for tap on the selection.

ui/touch_selection/touch_selection_controller.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 "ui/touch_selection/touch_selection_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 
@@ skipping 135 matching lines @@
     if ((event_pos - GetStartPosition()).LengthSquared() <=
         (event_pos - GetEndPosition()).LengthSquared()) {
       return start_selection_handle_->WillHandleTouchEvent(event);
     }
     return end_selection_handle_->WillHandleTouchEvent(event);
   }
 
   return false;
 }
 
-void TouchSelectionController::OnLongPressEvent() {
+bool TouchSelectionController::WillHandleLongPressEvent(
+    const gfx::PointF& location) {
+  if (WillHandleTapOrLongPress(location))
+    return true;
+
   response_pending_input_event_ = LONG_PRESS;
   ShowSelectionHandlesAutomatically();
   ShowInsertionHandleAutomatically();
   ForceNextUpdateIfInactive();
+  return false;
+}
+
+bool TouchSelectionController::WillHandleTapEvent(const gfx::PointF& location) {
+  if (WillHandleTapOrLongPress(location))
+    return true;
+
+  response_pending_input_event_ = TAP;
+  if (active_status_ != SELECTION_ACTIVE)
+    activate_selection_automatically_ = false;
+  ShowInsertionHandleAutomatically();
+  if (selection_empty_ && !show_on_tap_for_empty_editable_)
+    DeactivateInsertion();
+  ForceNextUpdateIfInactive();
+  return false;
+}
+
+bool TouchSelectionController::WillHandleTapOrLongPress(

[jdduke (slow), 2015/05/12 22:33:01]

Nit: The implementation order should match the declaration order. Please move
this method implementation to where it should go relative to how it's declared
in the header.

[Donn Denman, 2015/05/12 22:52:48]

Oh, didn't know that!

Done.

+    const gfx::PointF& location) {
+  // If there is an active selection that was not triggered by a user gesture,
+  // allow showing the handles for that selection if a gesture occurs within
+  // the selection rect. Note that this hit test is at best a crude
+  // approximation, and may swallow taps that actually fall outside the
+  // real selection.
+  if (active_status_ != SELECTION_ACTIVE &&

[Donn Denman, 2015/05/12 21:42:49]

Jared, please double-check this conditional -- I needed to rework it to adapt
for recent changes.

[jdduke (slow), 2015/05/12 22:33:00]

This can just be 

if (active_status_ == INACTIVE &&
    ...

[Donn Denman, 2015/05/12 22:52:48]

Done.

Noticed we don't need separate nested if's, so consolidated those.

+      active_status_ != INSERTION_ACTIVE) {
+    if (GetStartPosition() != GetEndPosition() &&
+        RectFBetweenSelectionBounds(start_, end_).Contains(location)) {
+      AllowShowingFromCurrentSelection();
+      return true;
+    }
+  }
+  return false;
 }
 
 void TouchSelectionController::AllowShowingFromCurrentSelection() {
   if (active_status_ != INACTIVE)
     return;
 
   activate_selection_automatically_ = true;
   activate_insertion_automatically_ = true;
   if (GetStartPosition() != GetEndPosition()) {
     OnSelectionChanged();
   } else if (start_orientation_ == TouchHandleOrientation::CENTER &&
              selection_editable_) {
     OnInsertionChanged();
   }
 }
 
-void TouchSelectionController::OnTapEvent() {
-  response_pending_input_event_ = TAP;
-  if (active_status_ != SELECTION_ACTIVE)
-    activate_selection_automatically_ = false;
-  ShowInsertionHandleAutomatically();
-  if (selection_empty_ && !show_on_tap_for_empty_editable_)
-    DeactivateInsertion();
-  ForceNextUpdateIfInactive();
-}
-
 void TouchSelectionController::HideAndDisallowShowingAutomatically() {
   response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
   DeactivateInsertion();
   DeactivateSelection();
   activate_insertion_automatically_ = false;
   activate_selection_automatically_ = false;
 }
 
 void TouchSelectionController::SetTemporarilyHidden(bool hidden) {
   if (temporarily_hidden_ == hidden)
@@ skipping 305 matching lines @@
     base::TimeDelta duration = base::TimeTicks::Now() - selection_start_time_;
     UMA_HISTOGRAM_CUSTOM_TIMES("Event.TouchSelection.WasDraggedDuration",
                                duration,
                                base::TimeDelta::FromMilliseconds(500),
                                base::TimeDelta::FromSeconds(60),
                                60);
   }
 }
 
 }  // namespace ui