Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/autocomplete_popup_model.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_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
@@ skipping 13 matching lines @@
 // AutocompletePopupModel
 
 AutocompletePopupModel::AutocompletePopupModel(
     AutocompletePopupView* popup_view,
     AutocompleteEditModel* edit_model,
     Profile* profile)
     : view_(popup_view),
       edit_model_(edit_model),
       profile_(profile),
       hovered_line_(kNoMatch),
-      selected_line_(kNoMatch) {
+      selected_line_(kNoMatch),
+      keyword_selected_(false) {
   edit_model->set_popup_model(this);
 }
 
 AutocompletePopupModel::~AutocompletePopupModel() {
 }
 
 bool AutocompletePopupModel::IsOpen() const {
   return view_->IsOpen();
 }
 
@@ skipping 42 matching lines @@
 
   // We need to update |selected_line_| before calling OnPopupDataChanged(), so
   // that when the edit notifies its controller that something has changed, the
   // controller can get the correct updated data.
   //
   // NOTE: We should never reach here with no selected line; the same code that
   // opened the popup and made it possible to get here should have also set a
   // selected line.
   CHECK(selected_line_ != kNoMatch);
   GURL current_destination(result.match_at(selected_line_).destination_url);
+  keyword_selected_ = false;
   view_->InvalidateLine(selected_line_);
   selected_line_ = line;
   view_->InvalidateLine(selected_line_);
 
   // Update the edit with the new data for this match.
   // TODO(pkasting): If |selected_line_| moves to the controller, this can be
   // eliminated and just become a call to the observer on the edit.
-  string16 keyword;
-  const bool is_keyword_hint = GetKeywordForMatch(match, &keyword);
+  string16 keyword = match.keyword;
+  const bool is_keyword_hint = match.associated_keyword.get() != NULL;
+  if (is_keyword_hint)
+    keyword = match.associated_keyword->keyword;
+
   if (reset_to_default) {
     string16 inline_autocomplete_text;
     if ((match.inline_autocomplete_offset != string16::npos) &&
         (match.inline_autocomplete_offset < match.fill_into_edit.length())) {
       inline_autocomplete_text =
           match.fill_into_edit.substr(match.inline_autocomplete_offset);
     }
     edit_model_->OnPopupDataChanged(inline_autocomplete_text, NULL,
                                     keyword, is_keyword_hint);
   } else {
     edit_model_->OnPopupDataChanged(match.fill_into_edit, &current_destination,
                                     keyword, is_keyword_hint);
   }
 
   // Repaint old and new selected lines immediately, so that the edit doesn't
   // appear to update [much] faster than the popup.
   view_->PaintUpdatesNow();
 }
 
 void AutocompletePopupModel::ResetToDefaultMatch() {
   const AutocompleteResult& result = this->result();
   CHECK(!result.empty());
   SetSelectedLine(result.default_match() - result.begin(), true, false);
   view_->OnDragCanceled();
 }
 
-bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
-                                                string16* keyword) const {
-  // Assume we have no keyword until we find otherwise.
-  keyword->clear();
-
-  if (match.template_url) {
-    TemplateURLService* url_service =
-        TemplateURLServiceFactory::GetForProfile(profile_);
-    if (!url_service)
-      return false;
-
-    // Only show the keyword for the default provider if the user typed in
-    // the keyword and it isn't SEARCH_WHAT_YOU_TYPED.
-    const TemplateURL* default_url = url_service->GetDefaultSearchProvider();
-    if (default_url && (default_url->id() == match.template_url->id())) {
-      if (StartsWith(autocomplete_controller()->input().text(),
-                     default_url->keyword(), false) &&
-          (match.type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED)) {
-        keyword->assign(match.template_url->keyword());
-        return false;
-      }
-    } else if (TemplateURL::SupportsReplacement(match.template_url)) {
-      // The current match is a keyword, return that as the selected keyword.
-      keyword->assign(match.template_url->keyword());
-      return false;
-    }
-  }
-
-  // See if the current match's fill_into_edit corresponds to a keyword.
-  return GetKeywordForText(match.fill_into_edit, keyword);
-}
-
-bool AutocompletePopupModel::GetKeywordForText(const string16& text,
-                                               string16* keyword) const {
-  // Creates keyword_hint first in case |keyword| is a pointer to |text|.
-  const string16 keyword_hint(TemplateURLService::CleanUserInputKeyword(text));
-
-  // Assume we have no keyword until we find otherwise.
-  keyword->clear();
-
-  if (keyword_hint.empty())
-    return false;
-  TemplateURLService* url_service =
-      TemplateURLServiceFactory::GetForProfile(profile_);
-  if (!url_service)
-    return false;
-  url_service->Load();
-
-  // Don't provide a hint if this keyword doesn't support replacement.
-  const TemplateURL* const template_url =
-      url_service->GetTemplateURLForKeyword(keyword_hint);
-  if (!TemplateURL::SupportsReplacement(template_url))
-    return false;
-
-  // Don't provide a hint for inactive/disabled extension keywords.
-  if (template_url->IsExtensionKeyword()) {
-    const Extension* extension = profile_->GetExtensionService()->
-        GetExtensionById(template_url->GetExtensionId(), false);
-    if (!extension ||
-        (profile_->IsOffTheRecord() &&
-         !profile_->GetExtensionService()->
-             IsIncognitoEnabled(extension->id())))
-      return false;
-  }
-
-  keyword->assign(keyword_hint);
-  return true;
-}
-
 void AutocompletePopupModel::Move(int count) {
   const AutocompleteResult& result = this->result();
   if (result.empty())
     return;
 
   // The user is using the keyboard to change the selection, so stop tracking
   // hover.
   SetHoveredLine(kNoMatch);
 
   // Clamp the new line to [0, result_.count() - 1].
   const size_t new_line = selected_line_ + count;
   SetSelectedLine(((count < 0) && (new_line >= selected_line_)) ? 0 : new_line,
                   false, false);
 }
 
+void AutocompletePopupModel::SelectKeyword(bool selected) {
+  const AutocompleteResult& result = this->result();

[Peter Kasting, 2011/07/29 21:08:44]

Nit: Just call result() directly in the expressions below, no need for a temp.

+  DCHECK(!result.empty() && selected_line_ != kNoMatch);

[Peter Kasting, 2011/07/29 21:08:44]

Nit: If you split this into a DCHECK() and a DCHECK_NE(), it will be easier to
see later what's wrong if one fails.

+
+  const AutocompleteMatch& match = result.match_at(selected_line_);
+  DCHECK(match.associated_keyword.get());

[sky, 2011/08/01 16:02:15]

nit: make the DCHECK  a single line.

+
+  keyword_selected_ = selected;
+  view_->InvalidateLine(selected_line_);
+}
+
 void AutocompletePopupModel::TryDeletingCurrentItem() {
   // We could use InfoForCurrentSelection() here, but it seems better to try
   // and shift-delete the actual selection, rather than any "in progress, not
   // yet visible" one.
   if (selected_line_ == kNoMatch)
     return;
 
   // Cancel the query so the matches don't change on the user.
   autocomplete_controller()->Stop(false);
 
@@ skipping 28 matching lines @@
       match.template_url->GetExtensionId());
 }
 
 void AutocompletePopupModel::OnResultChanged() {
   const AutocompleteResult& result = this->result();
   selected_line_ = result.default_match() == result.end() ?
       kNoMatch : static_cast<size_t>(result.default_match() - result.begin());
   // There had better not be a nonempty result set with no default match.
   CHECK((selected_line_ != kNoMatch) || result.empty());
   manually_selected_match_.Clear();
+  keyword_selected_ = false;
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
   view_->UpdatePopupAppearance();
 }