Makes the omnibox show past searches and suggestions for keywords.

We talked about primary and secondary, but after doing it all I felt
keyword and default better portrayed what is going on.

After trying this out I think we need to tune relevancy. But that
can be done later

BUG=3636
TEST=make sure omnibox isn't broken.

Review URL: http://codereview.chromium.org/66073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13668 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index 8cc5ced..46bd01c 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -212,8 +212,7 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
   keyword->clear();
 
   // If the current match is a keyword, return that as the selected keyword.
-  if (match.template_url && match.template_url->url() &&
-      match.template_url->url()->SupportsReplacement()) {
+  if (TemplateURL::SupportsReplacement(match.template_url)) {
     keyword->assign(match.template_url->keyword());
     return false;
   }
@@ -230,8 +229,7 @@ bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
   // Don't provide a hint if this keyword doesn't support replacement.
   const TemplateURL* const template_url =
       profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword_hint);
-  if (!template_url || !template_url->url() ||
-      !template_url->url()->SupportsReplacement())
+  if (!TemplateURL::SupportsReplacement(template_url))
     return false;
 
   keyword->assign(keyword_hint);