Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(596)

Unified Diff: chrome/browser/search_engines/template_url_service.cc

Issue 10184009: Add missing checks that default search contains search term replacement. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 70c3d1f90adc88d926be2c6e8ae90739ba7c8bfa..edabfec04db0ebdcb1387a50678af46513d39e00 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -612,7 +612,8 @@ void TemplateURLService::OnWebDataServiceRequestDone(
}
// Note that this saves the default search provider to prefs.
if (!default_search_provider ||
- !default_search_provider->IsExtensionKeyword())
+ (!default_search_provider->IsExtensionKeyword() &&
+ default_search_provider->SupportsReplacement()))
SetDefaultSearchProviderNoNotify(default_search_provider);
} else {
// If we had a managed default, replace it with the synced default if
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698