summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 00:22:42 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 00:22:42 +0000
commit4405e6aba06c0fb938ad25df1497d3960b632630 (patch)
tree781cb19742ee70bdaa4426b47f8e83f543ecc26f
parent0ae7c90f0e6ddefacba9bdc1659a408185de7700 (diff)
downloadchromium_src-4405e6aba06c0fb938ad25df1497d3960b632630.zip
chromium_src-4405e6aba06c0fb938ad25df1497d3960b632630.tar.gz
chromium_src-4405e6aba06c0fb938ad25df1497d3960b632630.tar.bz2
Disable search engine protector on Mac and Linux
BUG=102765 TEST= Review URL: http://codereview.chromium.org/8351088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108369 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/search_engines/template_url_service.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 96fec74..4a0f658 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -526,6 +526,9 @@ void TemplateURLService::OnWebDataServiceRequestDone(
LoadDefaultSearchProviderFromPrefs(&default_from_prefs,
&is_default_search_managed_);
+ // TODO(sail): Re-enable the protector on Mac and Linux once various
+ // crashes and UI issues are fixed. See http://crbug.com/102765
+#if defined(OS_WIN)
// Check if the default search provider has been changed and notify
// Protector instance about it. Don't check if the default search is
// managed.
@@ -541,6 +544,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
default_search_provider,
backup_default_search_provider));
}
+#endif
// Remove entries that were created because of policy as they may have
// changed since the database was saved.