summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_classifier.h
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 03:48:54 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 03:48:54 +0000
commit72874a8dad70024f8b4bc95120c2a4dada8f7abc (patch)
tree3536bca2f3e4b821aedbb14acb5cf24227273417 /chrome/browser/autocomplete/autocomplete_classifier.h
parente24a63674725007f2eefa5eaba4745941b30aa89 (diff)
downloadchromium_src-72874a8dad70024f8b4bc95120c2a4dada8f7abc.zip
chromium_src-72874a8dad70024f8b4bc95120c2a4dada8f7abc.tar.gz
chromium_src-72874a8dad70024f8b4bc95120c2a4dada8f7abc.tar.bz2
Fix a browser crash involving omnibox extension keywords.
The |match| sometimes did not have a valid template_url, because GetInfoForCurrentText was classifying the match using the wrong parameters. Fixed to use prefer_keyword==true in this case. BUG=81776 TEST=see bug for repro Review URL: http://codereview.chromium.org/6995032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_classifier.h')
-rw-r--r--chrome/browser/autocomplete/autocomplete_classifier.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_classifier.h b/chrome/browser/autocomplete/autocomplete_classifier.h
index d09f304..a089cef 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier.h
+++ b/chrome/browser/autocomplete/autocomplete_classifier.h
@@ -25,6 +25,8 @@ class AutocompleteClassifier {
// Given some string |text| that the user wants to use for navigation,
// determines how it should be interpreted. |desired_tld| is the user's
// desired TLD, if any; see AutocompleteInput::desired_tld().
+ // |prefer_keyword| should be true the when keyword UI is onscreen; see
+ // comments on AutocompleteController::Start().
// |allow_exact_keyword_match| should be true when treating the string as a
// potential keyword search is valid; see
// AutocompleteInput::allow_exact_keyword_match(). |match| should be a
@@ -36,6 +38,7 @@ class AutocompleteClassifier {
// AutocompleteResult::alternate_nav_url_ in autocomplete.h.
void Classify(const string16& text,
const string16& desired_tld,
+ bool prefer_keyword,
bool allow_exact_keyword_match,
AutocompleteMatch* match,
GURL* alternate_nav_url);