ash: Select omnibox text on mouse up instead of down.

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/property_bag.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 69 matching lines @@
   virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE {
     bool handled = views::Textfield::OnKeyPressed(event);
     return omnibox_view_->HandleAfterKeyEvent(event, handled) || handled;
   }
 
   virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE {
     return omnibox_view_->HandleKeyReleaseEvent(event);
   }
 
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
-    return omnibox_view_->HandleMousePressEvent(event);
+    // Pass through the views::Textfield's return value; we don't need to
+    // override its behavior.
+    bool result = views::Textfield::OnMousePressed(event);
+    omnibox_view_->HandleMousePressEvent(event);
+    return result;
+  }
+
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE {
+    bool result = views::Textfield::OnMouseDragged(event);
+    omnibox_view_->HandleMouseDragEvent(event);
+    return result;
+  }
+
+  virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE {
+    views::Textfield::OnMouseReleased(event);
+    omnibox_view_->HandleMouseReleaseEvent(event);
   }
 
  private:
   OmniboxViewViews* omnibox_view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteTextfield);
 };
 
 // Stores omnibox state for each tab.
 struct ViewState {
@@ skipping 72 matching lines @@
                                    LocationBarView* location_bar)
     : popup_window_mode_(popup_window_mode),
       model_(new AutocompleteEditModel(this, controller, profile)),
       controller_(controller),
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       security_level_(ToolbarModel::NONE),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
       location_bar_view_(location_bar),
-      ime_candidate_window_open_(false) {
+      ime_candidate_window_open_(false),
+      select_all_on_mouse_release_(false) {
 }
 
 OmniboxViewViews::~OmniboxViewViews() {
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager::GetInstance()->
       RemoveCandidateWindowObserver(this);
 #endif
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
@@ skipping 104 matching lines @@
   // the control-key state is changed.
   if (event.key_code() == ui::VKEY_CONTROL) {
     // TODO(oshima): investigate if we need to support keyboard with two
     // controls.
     model_->OnControlKeyChanged(false);
     return true;
   }
   return false;
 }
 
-bool OmniboxViewViews::HandleMousePressEvent(const views::MouseEvent& event) {
-  if (!textfield_->HasFocus() && !textfield_->HasSelection()) {
+void OmniboxViewViews::HandleMousePressEvent(const views::MouseEvent& event) {
+  select_all_on_mouse_release_ =
+      (event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
+      !textfield_->HasFocus();
+}
+
+void OmniboxViewViews::HandleMouseDragEvent(const views::MouseEvent& event) {
+  select_all_on_mouse_release_ = false;
+}
+
+void OmniboxViewViews::HandleMouseReleaseEvent(const views::MouseEvent& event) {
+  if ((event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
+      select_all_on_mouse_release_) {
     textfield_->SelectAll();
-    textfield_->RequestFocus();
-    return true;
   }
-
-  return false;
+  select_all_on_mouse_release_ = false;
 }
 
 void OmniboxViewViews::HandleFocusIn() {
   // TODO(oshima): Get control key state.
   model_->OnSetFocus(false);
   // Don't call controller_->OnSetFocus as this view has already
   // acquired the focus.
 }
 
 void OmniboxViewViews::HandleFocusOut() {
@@ skipping 542 matching lines @@
   OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
                                                         toolbar_model,
                                                         profile,
                                                         command_updater,
                                                         popup_window_mode,
                                                         location_bar);
   omnibox_view->Init();
   return omnibox_view;
 }
 #endif