| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/plugin_updater.h" | 5 #include "chrome/browser/plugin_updater.h" | 
| 6 | 6 | 
| 7 #include <string> | 7 #include <string> | 
| 8 | 8 | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" | 
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 332 /*static*/ | 332 /*static*/ | 
| 333 PluginUpdater* PluginUpdater::GetInstance() { | 333 PluginUpdater* PluginUpdater::GetInstance() { | 
| 334   return Singleton<PluginUpdater>::get(); | 334   return Singleton<PluginUpdater>::get(); | 
| 335 } | 335 } | 
| 336 | 336 | 
| 337 /*static*/ | 337 /*static*/ | 
| 338 void PluginUpdater::RegisterPrefs(PrefService* prefs) { | 338 void PluginUpdater::RegisterPrefs(PrefService* prefs) { | 
| 339   FilePath internal_dir; | 339   FilePath internal_dir; | 
| 340   PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); | 340   PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); | 
| 341   prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, | 341   prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, | 
| 342                               internal_dir); | 342                               internal_dir, | 
| 343   prefs->RegisterListPref(prefs::kPluginsDisabledPlugins); | 343                               false /* don't sync pref */); | 
| 344   prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); | 344   prefs->RegisterListPref(prefs::kPluginsDisabledPlugins, | 
| 345   prefs->RegisterListPref(prefs::kPluginsEnabledPlugins); | 345                           false /* don't sync pref */); | 
|  | 346   prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, | 
|  | 347                           false /* don't sync pref */); | 
|  | 348   prefs->RegisterListPref(prefs::kPluginsEnabledPlugins, | 
|  | 349                           false /* don't sync pref */); | 
| 346 } | 350 } | 
| OLD | NEW | 
|---|