Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/keyword_provider.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/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 145 matching lines @@
   // TODO(pkasting): http://b/1112681 If someday we remember usage frequency for
   // keywords, we might suggest keywords that haven't even been partially typed,
   // if the user uses them enough and isn't obviously typing something else.  In
   // this case we'd consider all input here to be query input.
   string16 keyword, remaining_input;
   if (!ExtractKeywordFromInput(input, &keyword, &remaining_input))
     return;
 
   // Make sure the model is loaded. This is cheap and quickly bails out if
   // the model is already loaded.
-  TemplateURLService* model =
-      profile_ ?
-      TemplateURLServiceFactory::GetForProfile(profile_) :
-      model_;
+  TemplateURLService* model = GetTemplateURLService();

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

Nit: I also meant for the DCHECK() and Load() call to go into the getter.

   DCHECK(model);
   model->Load();
 
   // Get the best matches for this keyword.
   //
   // NOTE: We could cache the previous keywords and reuse them here in the
   // |minimal_changes| case, but since we'd still have to recalculate their
   // relevances and we can just recreate the results synchronously anyway, we
   // don't bother.
   //
   // TODO(pkasting): http://b/893701 We should remember the user's use of a
   // search query both from the autocomplete popup and from web pages
   // themselves.
   std::vector<string16> keyword_matches;
   model->FindMatchingKeywords(keyword,
                               !remaining_input.empty(),
                               &keyword_matches);
 
-  // Prune any extension keywords that are disallowed in incognito mode (if
-  // we're incognito), or disabled.
   for (std::vector<string16>::iterator i(keyword_matches.begin());
        i != keyword_matches.end(); ) {
     const TemplateURL* template_url(model->GetTemplateURLForKeyword(*i));
+
+    // Prune any extension keywords that are disallowed in incognito mode (if
+    // we're incognito), or disabled.
     if (profile_ &&
         input.matches_requested() == AutocompleteInput::ALL_MATCHES &&
         template_url->IsExtensionKeyword()) {
       ExtensionService* service = profile_->GetExtensionService();
       const Extension* extension = service->GetExtensionById(
           template_url->GetExtensionId(), false);
       bool enabled =
           extension && (!profile_->IsOffTheRecord() ||
                         service->IsIncognitoEnabled(extension->id()));
       if (!enabled) {
         i = keyword_matches.erase(i);
         continue;
       }
     }
+
+    // Prune any substituting keywords if there is no substitution.
+    if (TemplateURL::SupportsReplacement(template_url) &&
+        !input.allow_exact_keyword_match()) {
+      i = keyword_matches.erase(i);
+      continue;
+    }
+
     ++i;
   }
   if (keyword_matches.empty())
     return;
   std::sort(keyword_matches.begin(), keyword_matches.end(), CompareQuality());
 
   // Limit to one exact or three inexact matches, and mark them up for display
   // in the autocomplete popup.
   // Any exact match is going to be the highest quality match, and thus at the
   // front of our vector.
@@ skipping 163 matching lines @@
                                         bool prefer_keyword,
                                         bool allow_exact_keyword_match) {
   if (!complete)
     return (type == AutocompleteInput::URL) ? 700 : 450;
   if (!supports_replacement || (allow_exact_keyword_match && prefer_keyword))
     return 1500;
   return (allow_exact_keyword_match && (type == AutocompleteInput::QUERY)) ?
       1450 : 1100;
 }
 
+string16 KeywordProvider::GetKeywordForText(

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

DOesn't match position in header.

+  const string16& text) const {

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

Nit: Indent 4

+    const string16 keyword(TemplateURLService::CleanUserInputKeyword(text));

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

Nit: Whole function should be indented 2, not 4

+
+    if (keyword.empty())
+      return keyword;
+
+    TemplateURLService* url_service = GetTemplateURLService();
+    if (!url_service)
+      return string16();
+    url_service->Load();
+
+    // Don't provide a keyword if it doesn't support replacement.
+    const TemplateURL* const template_url =
+      url_service->GetTemplateURLForKeyword(keyword);

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

Nit: Indent 4 (3 places)

+    if (!TemplateURL::SupportsReplacement(template_url))
+      return string16();
+
+    // Don't provide a keyword for inactive/disabled extension keywords.
+    if (template_url->IsExtensionKeyword()) {
+      const Extension* extension = profile_->GetExtensionService()->
+        GetExtensionById(template_url->GetExtensionId(), false);
+      if (!extension ||
+        (profile_->IsOffTheRecord() &&

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

nit: indenting off (should be one past ( on previous line.

+        !profile_->GetExtensionService()->IsIncognitoEnabled(extension->id())))
+        return string16();
+    }
+
+    return keyword;
+}
+
+TemplateURLService* KeywordProvider::GetTemplateURLService() const {
+  return profile_ ? TemplateURLServiceFactory::GetForProfile(profile_) :
+      model_;
+}
+
+AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
+    const string16& keyword,
+    const AutocompleteInput& input) {
+  return CreateAutocompleteMatch(GetTemplateURLService(), keyword, input,
+      keyword.size(), string16(), 0);
+}
+
 AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
     TemplateURLService* model,
     const string16& keyword,
     const AutocompleteInput& input,
     size_t prefix_length,
     const string16& remaining_input,
     int relevance) {
   DCHECK(model);
   // Get keyword data from data store.
   const TemplateURL* element(
       model->GetTemplateURLForKeyword(keyword));
   DCHECK(element && element->url());
   const bool supports_replacement = element->url()->SupportsReplacement();
 
   // Create an edit entry of "[keyword] [remaining input]".  This is helpful
   // even when [remaining input] is empty, as the user can select the popup
   // choice and immediately begin typing in query input.
   const bool keyword_complete = (prefix_length == keyword.length());
   if (relevance < 0) {
     relevance =
         CalculateRelevance(input.type(), keyword_complete,
                            // When the user wants keyword matches to take
                            // preference, score them highly regardless of
                            // whether the input provides query text.
                            supports_replacement, input.prefer_keyword(),
                            input.allow_exact_keyword_match());
   }
-  AutocompleteMatch result(this, relevance, false,
+  AutocompleteMatch match(this, relevance, false,
       supports_replacement ? AutocompleteMatch::SEARCH_OTHER_ENGINE :
                              AutocompleteMatch::HISTORY_KEYWORD);
-  result.fill_into_edit.assign(keyword);
+  match.fill_into_edit.assign(keyword);
   if (!remaining_input.empty() || !keyword_complete || supports_replacement)
-    result.fill_into_edit.push_back(L' ');
-  result.fill_into_edit.append(remaining_input);
+    match.fill_into_edit.push_back(L' ');
+  match.fill_into_edit.append(remaining_input);
   // If we wanted to set |result.inline_autocomplete_offset| correctly, we'd
   // need CleanUserInputKeyword() to return the amount of adjustment it's made
   // to the user's input.  Because right now inexact keyword matches can't score
   // more highly than a "what you typed" match from one of the other providers,
   // we just don't bother to do this, and leave inline autocompletion off.
-  result.inline_autocomplete_offset = string16::npos;
+  match.inline_autocomplete_offset = string16::npos;
 
   // Create destination URL and popup entry content by substituting user input
   // into keyword templates.
-  FillInURLAndContents(remaining_input, element, &result);
+  FillInURLAndContents(remaining_input, element, &match);
 
   if (supports_replacement)
-    result.template_url = element;
-  result.transition = PageTransition::KEYWORD;
+    match.template_url = element;
+  match.keyword = keyword;
+  match.transition = PageTransition::KEYWORD;
 
-  return result;
+  return match;
 }
 
 void KeywordProvider::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  TemplateURLService* model =
-      profile_ ? TemplateURLServiceFactory::GetForProfile(profile_) : model_;
+  TemplateURLService* model = GetTemplateURLService();
   const AutocompleteInput& input = extension_suggest_last_input_;
 
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED:
       // Input has been accepted, so we're done with this input session. Ensure
       // we don't send the OnInputCancelled event, or handle any more stray
       // suggestions_ready events.
       current_keyword_extension_id_.clear();
       current_input_id_ = 0;
       return;
@@ skipping 73 matching lines @@
 }
 
 void KeywordProvider::MaybeEndExtensionKeywordMode() {
   if (!current_keyword_extension_id_.empty()) {
     ExtensionOmniboxEventRouter::OnInputCancelled(
         profile_, current_keyword_extension_id_);
 
     current_keyword_extension_id_.clear();
   }
 }