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

Side by Side Diff: chrome/browser/web_resource/plugins_resource_service.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_registry_simple.h"
9 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
12 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
13 14
14 namespace { 15 namespace {
15 16
16 // Delay on first fetch so we don't interfere with startup. 17 // Delay on first fetch so we don't interfere with startup.
17 const int kStartResourceFetchDelayMs = 60 * 1000; 18 const int kStartResourceFetchDelayMs = 60 * 1000;
18 19
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 false, 59 false,
59 prefs::kPluginsResourceCacheUpdate, 60 prefs::kPluginsResourceCacheUpdate,
60 kStartResourceFetchDelayMs, 61 kStartResourceFetchDelayMs,
61 GetCacheUpdateDelay()) { 62 GetCacheUpdateDelay()) {
62 } 63 }
63 64
64 PluginsResourceService::~PluginsResourceService() { 65 PluginsResourceService::~PluginsResourceService() {
65 } 66 }
66 67
67 // static 68 // static
68 void PluginsResourceService::RegisterPrefs(PrefServiceSimple* local_state) { 69 void PluginsResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
69 local_state->RegisterDictionaryPref( 70 registry->RegisterDictionaryPref(prefs::kPluginsMetadata,
70 prefs::kPluginsMetadata, new base::DictionaryValue()); 71 new base::DictionaryValue());
71 local_state->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0"); 72 registry->RegisterStringPref(prefs::kPluginsResourceCacheUpdate, "0");
72 } 73 }
73 74
74 void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) { 75 void PluginsResourceService::Unpack(const DictionaryValue& parsed_json) {
75 prefs_->Set(prefs::kPluginsMetadata, parsed_json); 76 prefs_->Set(prefs::kPluginsMetadata, parsed_json);
76 PluginFinder::GetInstance()->ReinitializePlugins(parsed_json); 77 PluginFinder::GetInstance()->ReinitializePlugins(parsed_json);
77 } 78 }
OLDNEW
« no previous file with comments | « chrome/browser/web_resource/plugins_resource_service.h ('k') | chrome/browser/web_resource/promo_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698