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

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

Issue 9863047: Exclude ProtectorService code from Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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 | « chrome/browser/protector/protector_utils.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | 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 8f47272a3465dc71f9307f88b1c02f8c80751b2d..00c3a60c579acaacafee1121358d91869342525a 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/protector/base_setting_change.h"
#include "chrome/browser/protector/protector_service.h"
#include "chrome/browser/protector/protector_service_factory.h"
+#include "chrome/browser/protector/protector_utils.h"
#include "chrome/browser/rlz/rlz.h"
#include "chrome/browser/search_engines/search_host_to_urls_map.h"
#include "chrome/browser/search_engines/search_terms_data.h"
@@ -628,6 +629,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
if (new_resource_keyword_version && service_.get())
service_->SetBuiltinKeywordVersion(new_resource_keyword_version);
+#if defined(ENABLE_PROTECTOR_SERVICE)
// Don't do anything if the default search provider has been changed since the
// check at the beginning (overridden by Sync).
if (is_default_search_hijacked &&
@@ -650,6 +652,7 @@ void TemplateURLService::OnWebDataServiceRequestDone(
SetDefaultSearchProviderNoNotify(default_search_provider_);
}
}
+#endif
NotifyObservers();
NotifyLoaded();
« no previous file with comments | « chrome/browser/protector/protector_utils.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698