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

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

Issue 340553005: Stop depending on TemplateURLService from DefaultSearchManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 6 years, 6 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
Index: chrome/browser/search_engines/default_search_manager.cc
diff --git a/chrome/browser/search_engines/default_search_manager.cc b/chrome/browser/search_engines/default_search_manager.cc
index da6a34191ea75eaf569bc903fe91d0621a6673e1..c1fc254584bcda05ccd020ce6f9807fd52f24a83 100644
--- a/chrome/browser/search_engines/default_search_manager.cc
+++ b/chrome/browser/search_engines/default_search_manager.cc
@@ -21,12 +21,16 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
-#include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/browser/search_engines/util.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/search_engines/template_url_data.h"
+namespace {
+
+bool g_fallback_search_engines_disabled = false;
+
+} // namespace
+
// A dictionary to hold all data related to the Default Search Engine.
// Eventually, this should replace all the data stored in the
// default_search_provider.* prefs.
@@ -107,6 +111,12 @@ void DefaultSearchManager::AddPrefValueToMap(base::DictionaryValue* value,
pref_value_map->SetValue(kDefaultSearchProviderDataPrefName, value);
}
+// static
+void DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(
+ bool disabled) {
+ g_fallback_search_engines_disabled = disabled;
+}
+
TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
Source* source) const {
if (default_search_controlled_by_policy_) {
@@ -127,7 +137,7 @@ TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
if (source)
*source = FROM_FALLBACK;
- return TemplateURLService::fallback_search_engines_disabled() ?
+ return g_fallback_search_engines_disabled ?
NULL : fallback_default_search_.get();
}
« no previous file with comments | « chrome/browser/search_engines/default_search_manager.h ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698