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

chrome/browser/ui/views/omnibox/omnibox_view_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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 10 matching lines @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
 #include "views/border.h"
 #include "views/controls/textfield/textfield.h"
+#include "views/events/event.h"
 #include "views/layout/fill_layout.h"
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
 #else
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
@@ skipping 31 matching lines @@
   virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE {
     return omnibox_view_->HandleKeyReleaseEvent(event);
   }
 
   virtual bool IsFocusable() const OVERRIDE {
     // Bypass Textfield::IsFocusable. The omnibox in popup window requires
     // focus in order for text selection to work.
     return views::View::IsFocusable();
   }
 
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
+    return omnibox_view_->HandleMousePressEvent(event);
+  }
+
  private:
   OmniboxViewViews* omnibox_view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteTextfield);
 };
 
 // Stores omnibox state for each tab.
 struct ViewState {
   explicit ViewState(const gfx::SelectionModel& selection_model)
       : selection_model(selection_model) {
@@ skipping 167 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. See omnibox_view_gtk.cc.
     model_->OnControlKeyChanged(false);
     return true;
   }
   return false;
 }
 
+bool OmniboxViewViews::HandleMousePressEvent(const views::MouseEvent& event) {
+  if (!textfield_->HasFocus() && !textfield_->HasSelection()) {

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

We may need to check if the textfield has IME composition text. Please ask
penghuang/suzhe/susukes if it's necessary.
(separate CL is fine)

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

Done. Will do.

+    textfield_->SelectAll();
+    textfield_->RequestFocus();
+    return true;
+  }
+
+  return 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() {
   // TODO(oshima): we don't have native view. This requires
   // further refactoring.
@@ skipping 452 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