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/plugins/plugin_prefs_factory.h" | 5 #include "chrome/browser/plugins/plugin_prefs_factory.h" |
6 | 6 |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "chrome/browser/plugins/plugin_prefs.h" | 9 #include "chrome/browser/plugins/plugin_prefs.h" |
10 #include "chrome/browser/profiles/incognito_helpers.h" | 10 #include "chrome/browser/profiles/incognito_helpers.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 false, | 68 false, |
69 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 69 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
70 registry->RegisterListPref(prefs::kPluginsPluginsList, | 70 registry->RegisterListPref(prefs::kPluginsPluginsList, |
71 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 71 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
72 registry->RegisterListPref(prefs::kPluginsDisabledPlugins, | 72 registry->RegisterListPref(prefs::kPluginsDisabledPlugins, |
73 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 73 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
74 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, | 74 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, |
75 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 75 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
76 registry->RegisterListPref(prefs::kPluginsEnabledPlugins, | 76 registry->RegisterListPref(prefs::kPluginsEnabledPlugins, |
77 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 77 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 78 registry->RegisterBooleanPref( |
| 79 prefs::kEnableNpapi, |
| 80 false, |
| 81 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
78 } | 82 } |
79 | 83 |
80 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( | 84 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( |
81 content::BrowserContext* context) const { | 85 content::BrowserContext* context) const { |
82 return chrome::GetBrowserContextRedirectedInIncognito(context); | 86 return chrome::GetBrowserContextRedirectedInIncognito(context); |
83 } | 87 } |
84 | 88 |
85 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { | 89 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { |
86 return true; | 90 return true; |
87 } | 91 } |
88 | 92 |
89 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { | 93 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { |
90 return true; | 94 return true; |
91 } | 95 } |
OLD | NEW |