Fix omnibox mouse click highlight/word select/focus issue in aura build.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 77 matching lines @@
 }
 
 NativeTextfieldViews::~NativeTextfieldViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, View overrides:
 
 bool NativeTextfieldViews::OnMousePressed(const MouseEvent& event) {
   OnBeforeUserAction();
-  textfield_->RequestFocus();
+  TrackMouseClicks(event);
 
-  if (event.IsOnlyLeftMouseButton()) {
-    base::TimeDelta time_delta = event.time_stamp() - last_click_time_;
-    gfx::Point location_delta = event.location().Subtract(last_click_location_);
-    if (time_delta.InMilliseconds() <= GetDoubleClickInterval() &&
-        !ExceededDragThreshold(location_delta.x(), location_delta.y())) {
-      aggregated_clicks_ = (aggregated_clicks_ + 1) % 3;
-    } else {
-      aggregated_clicks_ = 0;
-    }
-    last_click_time_ = event.time_stamp();
-    last_click_location_ = event.location();
-
-    initiating_drag_ = false;
-    bool can_drag = true;
-#if defined(TOUCH_UI)
-    can_drag = false;
-#endif
-    switch(aggregated_clicks_) {
-      case 0:
-        if (can_drag && GetRenderText()->IsPointInSelection(event.location()))
-          initiating_drag_ = true;
-        else
-          MoveCursorTo(event.location(), event.IsShiftDown());
-        break;
-      case 1:
-        model_->SelectWord();
-        OnCaretBoundsChanged();
-        break;
-      case 2:
-        model_->SelectAll();
-        OnCaretBoundsChanged();
-        break;
-      default:
-        NOTREACHED();
-    }
-    SchedulePaint();
+  // Allow the textfield/omnibox to optionally handle the mouse pressed event.
+  // This should be removed once native textfield implementations are
+  // consolidated to textfield.
+  if (!textfield_->OnMousePressed(event)) {
+    HandleMousePressEvent(event);
   }

[oshima, 2011/11/14 19:31:09]

nuke {}

[jennyz, 2011/11/14 19:50:14]

Done.

 
   OnAfterUserAction();
   return true;
 }
 
 bool NativeTextfieldViews::OnMouseDragged(const MouseEvent& event) {
   // Don't adjust the cursor on a potential drag and drop.
   if (initiating_drag_)
     return true;
 
@@ skipping 911 matching lines @@
   // Calls TextfieldController::ContentsChanged() explicitly if the paste action
   // did not change the content at all. See http://crbug.com/79002
   if (success && GetText() == textfield_->text()) {
     TextfieldController* controller = textfield_->GetController();
     if (controller)
       controller->ContentsChanged(textfield_, textfield_->text());
   }
   return success;
 }
 
+void NativeTextfieldViews::TrackMouseClicks(const MouseEvent& event) {
+  if (event.IsOnlyLeftMouseButton()) {
+    base::TimeDelta time_delta = event.time_stamp() - last_click_time_;
+    gfx::Point location_delta = event.location().Subtract(last_click_location_);
+    if (time_delta.InMilliseconds() <= GetDoubleClickInterval() &&
+        !ExceededDragThreshold(location_delta.x(), location_delta.y())) {
+      aggregated_clicks_ = (aggregated_clicks_ + 1) % 3;
+    } else {
+      aggregated_clicks_ = 0;
+    }
+    last_click_time_ = event.time_stamp();
+    last_click_location_ = event.location();
+  }
+}
+
+void NativeTextfieldViews::HandleMousePressEvent(const MouseEvent& event) {
+  if (event.IsOnlyLeftMouseButton()) {
+    textfield_->RequestFocus();
+
+    initiating_drag_ = false;
+    bool can_drag = true;
+#if defined(TOUCH_UI)
+    // Temporarily disable drag and drop on touch builds; see crbug.com/97845.
+    can_drag = false;
+#endif
+    switch(aggregated_clicks_) {
+      case 0:
+        if (can_drag && GetRenderText()->IsPointInSelection(event.location()))
+          initiating_drag_ = true;
+        else
+          MoveCursorTo(event.location(), event.IsShiftDown());
+        break;
+      case 1:
+        model_->SelectWord();
+        OnCaretBoundsChanged();
+        break;
+      case 2:
+        model_->SelectAll();
+        OnCaretBoundsChanged();
+        break;
+      default:
+        NOTREACHED();
+    }
+    SchedulePaint();
+  }
+}
+
 // static
 bool NativeTextfieldViews::ShouldInsertChar(char16 ch, int flags) {
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views