| 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 74b8401b1fa9a633ee2758fdeb015b11fa7da33f..cd763d73c00cdc57f54b1b002da584a62dee2e4a 100644
|
| --- a/chrome/browser/search_engines/default_search_manager.cc
|
| +++ b/chrome/browser/search_engines/default_search_manager.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/i18n/case_conversion.h"
|
| #include "base/prefs/pref_service.h"
|
| +#include "base/prefs/pref_value_map.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_split.h"
|
| @@ -67,6 +68,7 @@ const char DefaultSearchManager::kAlternateURLs[] = "alternate_urls";
|
| const char DefaultSearchManager::kSearchTermsReplacementKey[] =
|
| "search_terms_replacement_key";
|
| const char DefaultSearchManager::kCreatedByPolicy[] = "created_by_policy";
|
| +const char DefaultSearchManager::kDisabledByPolicy[] = "disabled_by_policy";
|
|
|
| DefaultSearchManager::DefaultSearchManager(PrefService* pref_service)
|
| : pref_service_(pref_service) {
|
| @@ -84,6 +86,12 @@ void DefaultSearchManager::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| +// static
|
| +void DefaultSearchManager::AddPrefValueToMap(base::DictionaryValue* value,
|
| + PrefValueMap* pref_value_map) {
|
| + pref_value_map->SetValue(kDefaultSearchProviderData, value);
|
| +}
|
| +
|
| bool DefaultSearchManager::GetDefaultSearchEngine(TemplateURLData* data) {
|
| const base::DictionaryValue* url_dict =
|
| pref_service_->GetDictionary(kDefaultSearchProviderData);
|
|
|