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 59 matching lines @@
       view_(view),
       popup_(NULL),
       controller_(controller),
       has_focus_(false),
       user_input_in_progress_(false),
       just_deleted_text_(false),
       has_temporary_text_(false),
       paste_state_(NONE),
       control_key_state_(UP),
       is_keyword_hint_(false),
+      result_frozen_(false),
       paste_and_go_transition_(PageTransition::TYPED),
       profile_(profile),
       update_instant_(true),
       instant_complete_behavior_(INSTANT_COMPLETE_DELAYED) {
 }
 
 AutocompleteEditModel::~AutocompleteEditModel() {
 }
 
 void AutocompleteEditModel::SetProfile(Profile* profile) {
@@ skipping 445 matching lines @@
   }
   controller_->OnAutocompleteAccept(url, disposition, transition,
                                     alternate_nav_url);
 
   InstantController* instant = controller_->GetInstant();
   if (instant && !popup_->IsOpen())
     instant->DestroyPreviewContents();
   update_instant_ = true;
 }
 
-bool AutocompleteEditModel::AcceptKeyword() {
+bool AutocompleteEditModel::AcceptKeyword(bool update_result) {
   DCHECK(is_keyword_hint_ && !keyword_.empty());
 
   view_->OnBeforePossibleChange();
+  result_frozen_ = !update_result;
   view_->SetWindowTextAndCaretPos(string16(), 0);
   is_keyword_hint_ = false;
   view_->OnAfterPossibleChange();
+  result_frozen_ = false;
   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.
   UserMetrics::RecordAction(UserMetricsAction("AcceptedKeywordHint"), profile_);
   return true;
 }
 
 void AutocompleteEditModel::ClearKeyword(const string16& visible_text) {
   view_->OnBeforePossibleChange();
@@ skipping 62 matching lines @@
   // Don't change anything unless the key state is actually toggling.
   if (pressed == (control_key_state_ == UP)) {
     ControlKeyState old_state = control_key_state_;
     control_key_state_ = pressed ? DOWN_WITHOUT_CHANGE : UP;
     if ((control_key_state_ == DOWN_WITHOUT_CHANGE) && has_temporary_text_) {
       // Arrowing down and then hitting control accepts the temporary text as
       // the input text.
       InternalSetUserText(UserTextFromDisplayText(view_->GetText()));
       has_temporary_text_ = false;
       if (KeywordIsSelected())
-        AcceptKeyword();
+        AcceptKeyword(true);
     }
     if ((old_state != DOWN_WITH_CHANGE) && popup_->IsOpen()) {
       // Autocomplete history provider results may change, so refresh the
       // popup.  This will force user_input_in_progress_ to true, but if the
       // popup is open, that should have already been the case.
       view_->UpdatePopup();
     }
   }
 }
 
@@ skipping 22 matching lines @@
     // normally.
     popup_->Move(count);
   }
 }
 
 void AutocompleteEditModel::OnPopupDataChanged(
     const string16& text,
     GURL* destination_for_temporary_text_change,
     const string16& keyword,
     bool is_keyword_hint) {
+

[Peter Kasting, 2011/04/01 00:09:09]

Nit: Don't add a blank line

   // Update keyword/hint-related local state.
   bool keyword_state_changed = (keyword_ != keyword) ||
       ((is_keyword_hint_ != is_keyword_hint) && !keyword.empty());
   if (keyword_state_changed) {
     keyword_ = keyword;
     is_keyword_hint_ = is_keyword_hint;
 
+    // If the current result has a duplicate keyword with a
+    // more relevant result, don't show a hint.
+    if (is_keyword_hint && popup_->selected_line() >= 1) {
+      const AutocompleteResult& result = this->result();
+      const AutocompleteResult::const_iterator match(result.begin() +
+        popup_->selected_line());
+      const AutocompleteResult::const_iterator found =

[Peter Kasting, 2011/04/01 00:09:09]

Nit: It's probably simpler overall to eliminate the functor here and just
directly write something like:

for (AutocompleteResult::const_iterator i(result.begin()); ...) {
  if (i->keyword == keyword_) {
    is_keyword_hint_ = false;
    keyword_.clear();
    break;
  }
}

+        std::search(result.begin(), match, match, match + 1,
+        AutocompleteMatch::KeywordsEqual);
+      if (found != match) {
+        is_keyword_hint_ = false;
+        keyword_.clear();
+      }
+    }
+
     // |is_keyword_hint_| should always be false if |keyword_| is empty.
     DCHECK(!keyword_.empty() || !is_keyword_hint_);
   }
 
   // Handle changes to temporary text.
   if (destination_for_temporary_text_change != NULL) {
     const bool save_original_selection = !has_temporary_text_;
     if (save_original_selection) {
       // Save the original selection and URL so it can be reverted later.
       has_temporary_text_ = true;
@@ skipping 74 matching lines @@
   // where the autocompleted text unexpectedly reappears, e.g. crbug.com/55983
   if (user_text_changed) {
     InternalSetUserText(UserTextFromDisplayText(new_text));
     has_temporary_text_ = false;
 
     // Track when the user has deleted text so we won't allow inline
     // autocomplete.
     just_deleted_text_ = just_deleted_text;
   }
 
-  view_->UpdatePopup();
+  if (!result_frozen_)
+    view_->UpdatePopup();
 
   // Change to keyword mode if the user has typed a keyword name and is now
   // pressing space after the name. Accepting the keyword will update our
   // state, so in that case there's no need to also return true here.
   return !(text_differs && allow_keyword_ui_change && !just_deleted_text &&
            MaybeAcceptKeywordBySpace(old_user_text, user_text_));
 }
 
 void AutocompleteEditModel::PopupBoundsChangedTo(const gfx::Rect& bounds) {
   InstantController* instant = controller_->GetInstant();
@@ skipping 156 matching lines @@
 bool AutocompleteEditModel::MaybeAcceptKeywordBySpace(
     const string16& old_user_text,
     const string16& new_user_text) {
   return (paste_state_ == NONE) && is_keyword_hint_ && !keyword_.empty() &&
       inline_autocomplete_text_.empty() && new_user_text.length() >= 2 &&
       IsSpaceCharForAcceptingKeyword(*new_user_text.rbegin()) &&
       !IsWhitespace(*(new_user_text.rbegin() + 1)) &&
       (old_user_text.length() + 1 >= new_user_text.length()) &&
       !new_user_text.compare(0, new_user_text.length() - 1, old_user_text,
                              0, new_user_text.length() - 1) &&
-      AcceptKeyword();
+      AcceptKeyword(true);
 }
 
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }