Chromium Code Reviews| Index: chrome/browser/web_resource/plugins_resource_service.cc |
| diff --git a/chrome/browser/web_resource/plugins_resource_service.cc b/chrome/browser/web_resource/plugins_resource_service.cc |
| index e6df0fd8dbd0419a39cd9d591480ef6beb13a02c..372edd3d1313ec5c285f6cc60828266503b74c98 100644 |
| --- a/chrome/browser/web_resource/plugins_resource_service.cc |
| +++ b/chrome/browser/web_resource/plugins_resource_service.cc |
| @@ -38,7 +38,7 @@ GURL GetPluginsServerURL() { |
| #elif defined(OS_MACOSX) |
| filename = "plugins_mac.json"; |
| #else |
| - NOTREACHED(); |
| +#error Unknown platform |
| #endif |
| std::string test_url = |
| @@ -62,6 +62,13 @@ PluginsResourceService::PluginsResourceService(PrefService* local_state) |
| GetCacheUpdateDelay()) { |
| } |
| +void PluginsResourceService::Init() { |
| + const base::DictionaryValue* metadata = |
| + prefs_->GetDictionary(prefs::kPluginsMetadata); |
|
Chris Evans
2013/02/08 19:25:23
Do you need to check for NULL here? Will it return
Bernhard Bauer
2013/02/11 09:58:19
No, prefs always return a default value, which is
|
| + PluginFinder::GetInstance()->ReinitializePlugins(metadata); |
| + StartAfterDelay(); |
| +} |
| + |
| PluginsResourceService::~PluginsResourceService() { |
| } |
| @@ -74,5 +81,5 @@ void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) { |
| void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) { |
| prefs_->Set(prefs::kPluginsMetadata, parsed_json); |
| - PluginFinder::GetInstance()->ReinitializePlugins(parsed_json); |
| + PluginFinder::GetInstance()->ReinitializePlugins(&parsed_json); |
| } |