Changes SearchProvider to set the description of the first consecutive

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 113 matching lines @@
 
 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 {
-  // If the current match is a keyword, return that as the selected keyword.
-  if (TemplateURL::SupportsReplacement(match.template_url)) {
-    keyword->assign(match.template_url->keyword());
-    return false;
+  // 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 use the default provider if the user typed in the keyword.
+    const TemplateURL* default_url = url_service->GetDefaultSearchProvider();
+    if (default_url && default_url->id() == match.template_url->id() &&

[Peter Kasting, 2011/07/07 01:16:07]

Nit: Slightly simpler conditionals by using else to avoid restating first
condition.  This also seems a little clearer to me:

// NO COMMENT HERE
if (default_url && default_url->id() == match.template_url->id()) {
  // This is using the default search provider.  Only claim we had a keyword if
in fact the user manually typed the provider's keyword.
  if (...) {
    ...
  }
} else if (TemplateURL::SupportsReplacement(match.template_url)) {
  ...
}

+        autocomplete_controller()->input().text().compare(

[Peter Kasting, 2011/07/07 01:16:07]

Nit: base::StartsWith()?

Do we need to worry about upper/lowercase?  Does this correctly handle
"?google.com" as input that does not have a keyword?

[sky, 2011/07/07 15:34:01]

As far as I can tell no. keywords are always lowercase, and if we're in keyword
mode the first part of the text is forced to lowercase.
Yes.

+            0u, default_url->keyword().size(), default_url->keyword()) == 0) {
+      keyword->assign(match.template_url->keyword());
+      return false;
+    }
+    // If the current match is a keyword, return that as the selected keyword.
+    if ((!default_url || default_url->id() != match.template_url->id()) &&
+        TemplateURL::SupportsReplacement(match.template_url)) {
+      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));
@@ skipping 94 matching lines @@
   CHECK((selected_line_ != kNoMatch) || result.empty());
   manually_selected_match_.Clear();
   // 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();
 }