Chromium Code Reviews| 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 b75082390bdc5a2acaace0cad8a21288e22b1eaf..a0fcc0ebe0549f7b47bdf34d2f8dcb5d5ada15e8 100644 |
| --- a/chrome/browser/search_engines/template_url_service.cc |
| +++ b/chrome/browser/search_engines/template_url_service.cc |
| @@ -33,6 +33,7 @@ |
| #include "chrome/browser/search_engines/search_host_to_urls_map.h" |
| #include "chrome/browser/search_engines/search_terms_data.h" |
| #include "chrome/browser/search_engines/template_url.h" |
| +#include "chrome/browser/search_engines/template_url_keys.h" |
| #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| #include "chrome/browser/search_engines/template_url_service_observer.h" |
| #include "chrome/browser/search_engines/util.h" |
| @@ -291,6 +292,7 @@ TemplateURLService::TemplateURLService(Profile* profile) |
| pending_synced_default_search_(false), |
| dsp_change_origin_(DSP_CHANGE_OTHER) { |
| DCHECK(profile_); |
| + default_search_manager_.reset(new DefaultSearchManager(GetPrefs())); |
| Init(NULL, 0); |
| } |
| @@ -310,6 +312,7 @@ TemplateURLService::TemplateURLService(const Initializer* initializers, |
| processing_syncer_changes_(false), |
| pending_synced_default_search_(false), |
| dsp_change_origin_(DSP_CHANGE_OTHER) { |
| + default_search_manager_.reset(new DefaultSearchManager(GetPrefs())); |
|
gab
2014/04/23 20:00:18
Initialize in initializer lists rather than in the
Cait (Slow)
2014/04/23 23:26:55
DefaultSearchManager takes a PrefService as input,
|
| Init(initializers, count); |
| } |
| @@ -678,6 +681,7 @@ bool TemplateURLService::CanMakeDefault(const TemplateURL* url) { |
| void TemplateURLService::SetUserSelectedDefaultSearchProvider( |
| TemplateURL* url) { |
| SetDefaultSearchProvider(url); |
| + default_search_manager_->SaveToPrefService(url->data()); |
| } |
| TemplateURL* TemplateURLService::GetDefaultSearchProvider() { |