OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/web_resource/plugins_resource_service.h" | 5 #include "chrome/browser/web_resource/plugins_resource_service.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/plugins/plugin_finder.h" | 8 #include "chrome/browser/plugins/plugin_finder.h" |
9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 | 54 |
55 PluginsResourceService::PluginsResourceService(PrefService* local_state) | 55 PluginsResourceService::PluginsResourceService(PrefService* local_state) |
56 : WebResourceService(local_state, | 56 : WebResourceService(local_state, |
57 GetPluginsServerURL(), | 57 GetPluginsServerURL(), |
58 false, | 58 false, |
59 prefs::kPluginsResourceCacheUpdate, | 59 prefs::kPluginsResourceCacheUpdate, |
60 kStartResourceFetchDelayMs, | 60 kStartResourceFetchDelayMs, |
61 GetCacheUpdateDelay()) { | 61 GetCacheUpdateDelay()) { |
62 } | 62 } |
63 | 63 |
64 void PluginsResourceService::Init() { | |
65 const base::DictionaryValue* metadata = | |
cevans
2013/02/05 21:06:52
Nit: hold on to it with const ref not ptr, if it c
Bernhard Bauer
2013/02/06 20:08:24
Hm. The interface returns a const ptr. What's the
| |
66 prefs_->GetDictionary(prefs::kPluginsMetadata); | |
67 PluginFinder::GetInstance()->ReinitializePlugins( | |
68 make_scoped_ptr(metadata->DeepCopy())); | |
cevans
2013/02/05 21:06:52
If however, metadata _could_ be NULL, you have a c
Bernhard Bauer
2013/02/06 20:08:24
It can't; GetDictionary() returns an empty diction
| |
69 StartAfterDelay(); | |
70 } | |
71 | |
64 PluginsResourceService::~PluginsResourceService() { | 72 PluginsResourceService::~PluginsResourceService() { |
65 } | 73 } |
66 | 74 |
67 // static | 75 // static |
68 void PluginsResourceService::RegisterPrefs(PrefServiceSimple* local_state) { | 76 void PluginsResourceService::RegisterPrefs(PrefServiceSimple* local_state) { |
69 local_state->RegisterDictionaryPref( | 77 local_state->RegisterDictionaryPref( |
70 prefs::kPluginsMetadata, new base::DictionaryValue()); | 78 prefs::kPluginsMetadata, new base::DictionaryValue()); |
71 local_state->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0"); | 79 local_state->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0"); |
72 } | 80 } |
73 | 81 |
74 void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) { | 82 void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) { |
75 prefs_->Set(prefs::kPluginsMetadata, parsed_json); | 83 prefs_->Set(prefs::kPluginsMetadata, parsed_json); |
76 PluginFinder::GetInstance()->ReinitializePlugins(parsed_json); | 84 PluginFinder::GetInstance()->ReinitializePlugins( |
85 make_scoped_ptr(parsed_json.DeepCopy())); | |
77 } | 86 } |
OLD | NEW |