Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 379 matching lines @@
   keyword_.clear();
   is_keyword_hint_ = false;
   has_temporary_text_ = false;
   view_->SetWindowTextAndCaretPos(permanent_text_,
                                   has_focus_ ? permanent_text_.length() : 0);
 }
 
 void AutocompleteEditModel::StartAutocomplete(
     bool has_selected_text,
     bool prevent_inline_autocomplete) const {
+  ClearPopupKeywordMode();
+
   bool keyword_is_selected = KeywordIsSelected();
   popup_->SetHoveredLine(AutocompletePopupModel::kNoMatch);
   // We don't explicitly clear AutocompletePopupModel::manually_selected_match,
   // as Start ends up invoking AutocompletePopupModel::OnResultChanged which
   // clears it.
   autocomplete_controller_->Start(
       user_text_, GetDesiredTLD(),
       prevent_inline_autocomplete || just_deleted_text_ ||
       (has_selected_text && inline_autocomplete_text_.empty()) ||
       (paste_state_ != NONE), keyword_is_selected,
@@ skipping 167 matching lines @@
 
   InstantController* instant = controller_->GetInstant();
   if (instant && !popup_->IsOpen())
     instant->DestroyPreviewContents();
   in_revert_ = false;
 }
 
 bool AutocompleteEditModel::AcceptKeyword() {
   DCHECK(is_keyword_hint_ && !keyword_.empty());
 
-  view_->OnBeforePossibleChange();
-  view_->SetWindowTextAndCaretPos(string16(), 0);
+  autocomplete_controller_->Stop(false);
   is_keyword_hint_ = false;
-  view_->OnAfterPossibleChange();
-  just_deleted_text_ = false;  // OnAfterPossibleChange() erroneously sets this
-                               // since the edit contents have disappeared.  It
-                               // doesn't really matter, but we clear it to be
-                               // consistent.
+
+  if (popup_->IsOpen())
+    popup_->SetSelectedLineState(AutocompletePopupModel::KEYWORD);
+
+  string16 display_text = autocomplete_controller_->keyword_provider()->
+      SplitReplacementStringFromInput(
+          CurrentMatch().associated_keyword->fill_into_edit, true);
+  view_->SetUserText(string16(), display_text, false);
+
   UserMetrics::RecordAction(UserMetricsAction("AcceptedKeywordHint"));
   return true;
 }
 
 void AutocompleteEditModel::ClearKeyword(const string16& visible_text) {
-  view_->OnBeforePossibleChange();
-  const string16 window_text(keyword_ + visible_text);
-  view_->SetWindowTextAndCaretPos(window_text.c_str(), keyword_.length());
-  keyword_.clear();
-  is_keyword_hint_ = false;
-  view_->OnAfterPossibleChange();
-  just_deleted_text_ = true;  // OnAfterPossibleChange() fails to clear this
-                              // since the edit contents have actually grown
-                              // longer.
+  autocomplete_controller_->Stop(false);
+  ClearPopupKeywordMode();
+
+  string16 window_text(keyword_);
+
+  if (!visible_text.empty())
+    window_text.append(char16(' ') + visible_text);
+
+  // Only reset the result if the edit text has changed since the
+  // keyword was accepted.
+  if (just_deleted_text_) {
+    view_->OnBeforePossibleChange();
+    view_->SetWindowTextAndCaretPos(window_text.c_str(), keyword_.length());
+    keyword_.clear();
+    is_keyword_hint_ = false;
+    view_->OnAfterPossibleChange();
+    just_deleted_text_ = true;  // OnAfterPossibleChange() fails to clear this
+                                // since the edit contents have actually grown
+                                // longer.
+  } else {
+    view_->SetUserText(window_text, window_text, false);
+    is_keyword_hint_ = true;
+    OnChanged();
+  }
 }
 
 const AutocompleteResult& AutocompleteEditModel::result() const {
   return autocomplete_controller_->result();
 }
 
 void AutocompleteEditModel::OnSetFocus(bool control_down) {
   has_focus_ = true;
   control_key_state_ = control_down ? DOWN_WITHOUT_CHANGE : UP;
 
@@ skipping 242 matching lines @@
             match->fill_into_edit.substr(match->inline_autocomplete_offset);
       }
 
       if (!prerender::IsOmniboxEnabled(profile_))
         DoPreconnect(*match);
 
       // We could prefetch the alternate nav URL, if any, but because there
       // can be many of these as a user types an initial series of characters,
       // the OS DNS cache could suffer eviction problems for minimal gain.
 
-      is_keyword_hint = popup_->GetKeywordForMatch(*match, &keyword);
+      keyword = match->keyword;

[Peter Kasting, 2011/12/15 22:56:04]

Nit: Shorter:

      is_keyword_hint = match->associated_keyword.get() != NULL;
      keyword = (is_keyword_hint ?
          match->associated_keyword->keyword : match->keyword);

+      is_keyword_hint = match->associated_keyword.get() != NULL;
+      if (is_keyword_hint)
+        keyword = match->associated_keyword->keyword;
     }
+
     popup_->OnResultChanged();
     OnPopupDataChanged(inline_autocomplete_text, NULL, keyword,
                        is_keyword_hint);
   } else {
     popup_->OnResultChanged();
   }
 
   if (popup_->IsOpen()) {
     PopupBoundsChangedTo(popup_->view()->GetTargetBounds());
   } else if (was_open) {
@@ skipping 12 matching lines @@
 void AutocompleteEditModel::InternalSetUserText(const string16& text) {
   user_text_ = text;
   just_deleted_text_ = false;
   inline_autocomplete_text_.clear();
 }
 
 bool AutocompleteEditModel::KeywordIsSelected() const {
   return !is_keyword_hint_ && !keyword_.empty();
 }
 
+void AutocompleteEditModel::ClearPopupKeywordMode() const {
+  if (popup_->IsOpen() &&
+      popup_->selected_line_state() == AutocompletePopupModel::KEYWORD)
+    popup_->SetSelectedLineState(AutocompletePopupModel::NORMAL);
+}
+
 string16 AutocompleteEditModel::DisplayTextFromUserText(
     const string16& text) const {
   return KeywordIsSelected() ?
       KeywordProvider::SplitReplacementStringFromInput(text, false) : text;
 }
 
 string16 AutocompleteEditModel::UserTextFromDisplayText(
     const string16& text) const {
   return KeywordIsSelected() ? (keyword_ + char16(' ') + text) : text;
 }
@@ skipping 79 matching lines @@
                              old_user_text.length() - caret_position + 1)) {
     return false;
   }
 
   // Then check if the text before the inserted space matches a keyword.
   string16 keyword;
   TrimWhitespace(new_user_text.substr(0, caret_position - 1),
                  TRIM_LEADING, &keyword);
 
   // Only allow exact keyword match if |keyword| represents a keyword hint.
-  return keyword.length() && popup_->GetKeywordForText(keyword, &keyword);
+  return keyword.length() &&
+      !autocomplete_controller_->keyword_provider()->
+          GetKeywordForText(keyword).empty();
 }
 
 bool AutocompleteEditModel::DoInstant(const AutocompleteMatch& match,
                                       string16* suggested_text) {
   DCHECK(suggested_text);
 
   if (in_revert_)
     return false;
 
   InstantController* instant = controller_->GetInstant();
@@ skipping 50 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }