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

Side by Side Diff: chrome/browser/plugins/plugin_finder.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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
« no previous file with comments | « chrome/browser/plugins/plugin_finder.h ('k') | chrome/browser/plugins/plugin_prefs_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/plugins/plugin_finder.h" 5 #include "chrome/browser/plugins/plugin_finder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 128 }
129 129
130 LoadMimeTypes(false, plugin_dict, plugin); 130 LoadMimeTypes(false, plugin_dict, plugin);
131 LoadMimeTypes(true, plugin_dict, plugin); 131 LoadMimeTypes(true, plugin_dict, plugin);
132 return plugin; 132 return plugin;
133 } 133 }
134 134
135 } // namespace 135 } // namespace
136 136
137 // static 137 // static
138 void PluginFinder::RegisterPrefs(PrefService* local_state) { 138 void PluginFinder::RegisterPrefs(PrefServiceSimple* local_state) {
139 local_state->RegisterBooleanPref(prefs::kDisablePluginFinder, false); 139 local_state->RegisterBooleanPref(prefs::kDisablePluginFinder, false);
140 } 140 }
141 141
142 // static 142 // static
143 PluginFinder* PluginFinder::GetInstance() { 143 PluginFinder* PluginFinder::GetInstance() {
144 // PluginFinder::GetInstance() is the only method that's allowed to call 144 // PluginFinder::GetInstance() is the only method that's allowed to call
145 // Singleton<PluginFinder>::get(). 145 // Singleton<PluginFinder>::get().
146 return Singleton<PluginFinder>::get(); 146 return Singleton<PluginFinder>::get();
147 } 147 }
148 148
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 DCHECK(!identifier_plugin_[identifier]); 311 DCHECK(!identifier_plugin_[identifier]);
312 identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin); 312 identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin);
313 313
314 #if defined(ENABLE_PLUGIN_INSTALLATION) 314 #if defined(ENABLE_PLUGIN_INSTALLATION)
315 if (installers_.find(identifier) == installers_.end()) 315 if (installers_.find(identifier) == installers_.end())
316 installers_[identifier] = new PluginInstaller(); 316 installers_[identifier] = new PluginInstaller();
317 #endif 317 #endif
318 } 318 }
319 } 319 }
320 } 320 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_finder.h ('k') | chrome/browser/plugins/plugin_prefs_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698