Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/autocomplete_edit.cc

Index: chrome/browser/autocomplete/autocomplete_edit.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_edit.cc	(revision 117356)
+++ chrome/browser/autocomplete/autocomplete_edit.cc	(working copy)
@@ -413,6 +413,8 @@
 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,
@@ -610,28 +612,48 @@
 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);
+  else
+    StartAutocomplete(false, true);
+
+  // Ensure the current selection is saved before showing keyword mode
+  // so that moving to another line and then reverting the text will restore
+  // the current state properly.
+  view_->OnTemporaryTextMaybeChanged(
+      DisplayTextFromUserText(CurrentMatch().fill_into_edit),
+      !has_temporary_text_);
+  has_temporary_text_ = true;
+
   content::RecordAction(UserMetricsAction("AcceptedKeywordHint"));
   return true;
 }
 
 void AutocompleteEditModel::ClearKeyword(const string16& visible_text) {
-  view_->OnBeforePossibleChange();
+  autocomplete_controller_->Stop(false);
+  ClearPopupKeywordMode();
+
   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.
+
+  // Only reset the result if the edit text has changed since the
+  // keyword was accepted, or if the popup is closed.
+  if (just_deleted_text_ || !visible_text.empty() || !popup_->IsOpen()) {
+    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_->SetWindowTextAndCaretPos(window_text.c_str(), keyword_.length());

[Peter Kasting, 2012/01/14 02:00:11]

This isn't right, because we also need to ensure view_->TextChanged() (or,
really, EmphasizeURLComponents()) gets called.

I'm thinking about the possibility of fixing this by expanding
SetWindowTextAndCaretPos() to optionally call UpdatePopup() and TextChanged()
(with an arg to control each).  There are two spots in OmniboxViewWin that could
then drop their explicit TextChanged() calls (and one would drop its optional
UpdatePopup() call).  Changing callers in AutocompleteEditModel will be slightly
trickier; most callers will not want either of these calls, but the code right
here would want TextChanged() (and could drop the OnChanged() below; not sure if
setting |is_keyword_hint_| would need to move up or not), and I think Revert()
could pass |true| for calling TextChanged(), and then
OmniboxViewWin::RevertAll() could drop its TextChanged() call and move the
|saved_selection_for_focus_change_| update above the call to Revert().  (We'd
need to test to ensure that move doesn't affect anything.)

+    is_keyword_hint_ = true;
+    OnChanged();
+  }
 }
 
 const AutocompleteResult& AutocompleteEditModel::result() const {
@@ -894,8 +916,9 @@
       // 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);
+      is_keyword_hint = match->GetKeyword(&keyword);
     }
+
     popup_->OnResultChanged();
     OnPopupDataChanged(inline_autocomplete_text, NULL, keyword,
                        is_keyword_hint);
@@ -928,6 +951,12 @@
   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() ?
@@ -1027,7 +1056,9 @@
                  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,