Omnibox: Better Enforce Suggest Relevance Constraints in Keyword Mode

chrome/browser/autocomplete/keyword_provider.cc

Index: chrome/browser/autocomplete/keyword_provider.cc
diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index c37da20e228f36040e821a071aecc4df86b70668..1292a2b9cc6867b70b96244f39db0d8c52b53eed 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -349,6 +349,20 @@ void KeywordProvider::Stop(bool clear_cached_results) {
   MaybeEndExtensionKeywordMode();
 }
 
+// static
+int KeywordProvider::CalculateRelevance(AutocompleteInput::Type type,

[Mark P, 2013/01/21 20:18:17]

This is an exact cut-and-paste.

+                                        bool complete,
+                                        bool supports_replacement,
+                                        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;
+}
+
 KeywordProvider::~KeywordProvider() {}
 
 // static
@@ -420,20 +434,6 @@ void KeywordProvider::FillInURLAndContents(
   }
 }
 
-// static
-int KeywordProvider::CalculateRelevance(AutocompleteInput::Type type,
-                                        bool complete,
-                                        bool supports_replacement,
-                                        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;
-}
-
 AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
     TemplateURLService* model,
     const string16& keyword,