Revert 245610 "Consistent fading behavior for touch editing handles"

content/browser/web_contents/touch_editable_impl_aura.cc

Index: content/browser/web_contents/touch_editable_impl_aura.cc
===================================================================
--- content/browser/web_contents/touch_editable_impl_aura.cc	(revision 245822)
+++ content/browser/web_contents/touch_editable_impl_aura.cc	(working copy)
@@ -62,7 +62,7 @@
     if (touch_selection_controller_)
       touch_selection_controller_->SelectionChanged();
   } else {
-    EndTouchEditing(false);
+    EndTouchEditing();
   }
 }
 
@@ -105,14 +105,12 @@
     touch_selection_controller_->SelectionChanged();
 }
 
-void TouchEditableImplAura::EndTouchEditing(bool quick) {
+void TouchEditableImplAura::EndTouchEditing() {
   if (touch_selection_controller_) {
-    if (touch_selection_controller_->IsHandleDragInProgress()) {
+    if (touch_selection_controller_->IsHandleDragInProgress())
       touch_selection_controller_->SelectionChanged();
-    } else {
-      touch_selection_controller_->HideHandles(quick);
+    else
       touch_selection_controller_.reset();
-    }
   }
 }
 
@@ -133,7 +131,7 @@
     return false;
 
   if (!event->IsGestureEvent()) {
-    EndTouchEditing(false);
+    EndTouchEditing();
     return false;
   }
 
@@ -177,7 +175,7 @@
       handles_hidden_due_to_scroll_ = false;
       if (touch_selection_controller_)
         handles_hidden_due_to_scroll_ = true;
-      EndTouchEditing(true);
+      EndTouchEditing();
       break;
     case ui::ET_GESTURE_SCROLL_END:
       // Scroll has ended, but we might still be in overscroll animation.
@@ -289,7 +287,7 @@
   ConvertPointFromScreen(&point);
   RenderWidgetHost* host = rwhva_->GetRenderWidgetHost();
   host->Send(new ViewMsg_ShowContextMenu(host->GetRoutingID(), point));
-  EndTouchEditing(false);
+  EndTouchEditing();
 }
 
 bool TouchEditableImplAura::IsCommandIdChecked(int command_id) const {
@@ -354,7 +352,7 @@
       NOTREACHED();
       break;
   }
-  EndTouchEditing(false);
+  EndTouchEditing();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -376,7 +374,7 @@
     rwhva_ = NULL;
   }
   text_input_type_ = ui::TEXT_INPUT_TYPE_NONE;
-  EndTouchEditing(true);
+  touch_selection_controller_.reset();
   handles_hidden_due_to_scroll_ = false;
   scroll_in_progress_ = false;
   overscroll_in_progress_ = false;