| Index: chrome/browser/autocomplete/keyword_provider.cc
|
| ===================================================================
|
| --- chrome/browser/autocomplete/keyword_provider.cc (revision 80563)
|
| +++ chrome/browser/autocomplete/keyword_provider.cc (working copy)
|
| @@ -179,11 +179,12 @@
|
| !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()) {
|
| @@ -198,6 +199,13 @@
|
| 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())
|
|
|