Hitting Tab should always move cursor to end of omnibox text.

chrome/browser/ui/views/location_bar/location_bar_view.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/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 381 matching lines @@
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (base::i18n::IsRTL())
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
   return origin;
 }
 
-#if defined(OS_WIN)
-void LocationBarView::OnCommitSuggestedText() {
-  InstantController* instant = delegate_->GetInstant();
-  DCHECK(instant);
-  DCHECK(suggested_text_view_);
-  OnCommitSuggestedText(location_entry_->GetText());
-}
-#endif
-
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0, GetThemeProvider()->GetBitmapNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
 
   // TODO(sky): baseline layout.
@@ skipping 340 matching lines @@
 
   InstantController* instant = delegate_->GetInstant();
   if (instant)
     instant->OnAutocompleteLostFocus(view_gaining_focus);
 }
 
 void LocationBarView::OnAutocompleteWillAccept() {
   update_instant_ = false;
 }
 
-bool LocationBarView::OnCommitSuggestedText(const string16& typed_text) {
-  InstantController* instant = delegate_->GetInstant();
-  if (!instant)
+bool LocationBarView::OnCommitSuggestedText(bool skip_inline_autocomplete) {
+  if (!delegate_->GetInstant())
     return false;
+
   string16 suggestion;
 #if defined(OS_WIN)
-  if (!HasValidSuggestText())
+  if (HasValidSuggestText())
+    suggestion = suggested_text_view_->GetText();
+#else
+  suggestion = location_entry_->GetInstantSuggestion();
+#endif
+
+  if (suggestion.empty())
     return false;
-  suggestion = suggested_text_view_->GetText();
-#endif
-  return location_entry_->CommitInstantSuggestion(typed_text, suggestion);
+
+  location_entry_->model()->FinalizeInstantQuery(
+      location_entry_->GetText(), suggestion, skip_inline_autocomplete);
+  return true;
 }
 
 bool LocationBarView::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(delegate_->GetInstant());
 }
 
 void LocationBarView::OnPopupBoundsChanged(const gfx::Rect& bounds) {
   InstantController* instant = delegate_->GetInstant();
   if (instant)
     instant->SetOmniboxBounds(bounds);
@@ skipping 53 matching lines @@
   string16 suggested_text;
   if (update_instant_ && instant && GetTabContentsWrapper()) {
     if (location_entry_->model()->user_input_in_progress() &&
         location_entry_->model()->popup_model()->IsOpen()) {
       instant->Update(GetTabContentsWrapper(),
                       location_entry_->model()->CurrentMatch(),
                       location_entry_->GetText(),
                       location_entry_->model()->UseVerbatimInstant(),
                       &suggested_text);
       if (!instant->MightSupportInstant()) {
-        location_entry_->model()->FinalizeInstantQuery(string16(),
-                                                       string16());
+        location_entry_->model()->FinalizeInstantQuery(
+            string16(), string16(), false);
       }
     } else {
       instant->DestroyPreviewContents();
-      location_entry_->model()->FinalizeInstantQuery(string16(),
-                                                     string16());
+      location_entry_->model()->FinalizeInstantQuery(
+          string16(), string16(), false);
     }
   }
 
   SetSuggestedText(suggested_text);
 }
 
 void LocationBarView::OnSelectionBoundsChanged() {
 #if defined(OS_WIN)
   if (suggested_text_view_)
     suggested_text_view_->StopAnimation();
@@ skipping 179 matching lines @@
   if (views::FocusManager::IsTabTraversalKeyEvent(e)) {
     if (HasValidSuggestText()) {
       // Return true so that the edit sees the tab and commits the suggestion.
       return true;
     }
     if (keyword_hint_view_->IsVisible() && !e.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
       return true;
     }
 
+    // If the caret is not at the end, then tab moves the caret to the end.
+    if (!location_entry_->IsCaretAtEnd())
+      return true;
+
     // Tab while showing instant commits instant immediately.
     // Return true so that focus traversal isn't attempted. The edit ends
     // up doing nothing in this case.
     if (AcceptCurrentInstantPreview())
       return true;
   }
 
   return location_entry_->SkipDefaultKeyEventProcessing(e);
 #else
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
@@ skipping 50 matching lines @@
 }
 
 void LocationBarView::SetSuggestedText(const string16& input) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kInstantAutocompleteImmediately)) {
     // This method is internally invoked to reset suggest text, so we only do
     // anything if the text isn't empty.
     // TODO: if we keep autocomplete, make it so this isn't invoked with empty
     // text.
     if (!input.empty()) {
-      location_entry_->model()->FinalizeInstantQuery(location_entry_->GetText(),
-                                                     input);
+      location_entry_->model()->FinalizeInstantQuery(
+          location_entry_->GetText(), input, false);
     }
     return;
   }
 #if defined(OS_WIN)
   // Don't show the suggested text if inline autocomplete is prevented.
   string16 text = location_entry_->model()->UseVerbatimInstant() ?
       string16() : input;
   if (!text.empty()) {
     if (!suggested_text_view_) {
       suggested_text_view_ = new SuggestedTextView(this);
@@ skipping 112 matching lines @@
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 #endif