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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); | 57 PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir); |
58 registry->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, | 58 registry->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory, |
59 internal_dir); | 59 internal_dir); |
60 registry->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash, false); | 60 registry->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash, false); |
61 registry->RegisterBooleanPref( | 61 registry->RegisterBooleanPref( |
62 prefs::kPluginsRemovedOldComponentPepperFlashSettings, false); | 62 prefs::kPluginsRemovedOldComponentPepperFlashSettings, false); |
63 registry->RegisterListPref(prefs::kPluginsPluginsList); | 63 registry->RegisterListPref(prefs::kPluginsPluginsList); |
64 registry->RegisterListPref(prefs::kPluginsDisabledPlugins); | 64 registry->RegisterListPref(prefs::kPluginsDisabledPlugins); |
65 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); | 65 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); |
66 registry->RegisterListPref(prefs::kPluginsEnabledPlugins); | 66 registry->RegisterListPref(prefs::kPluginsEnabledPlugins); |
67 registry->RegisterBooleanPref(prefs::kEnableNpapi, false); | |
68 } | 67 } |
69 | 68 |
70 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( | 69 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( |
71 content::BrowserContext* context) const { | 70 content::BrowserContext* context) const { |
72 return chrome::GetBrowserContextRedirectedInIncognito(context); | 71 return chrome::GetBrowserContextRedirectedInIncognito(context); |
73 } | 72 } |
74 | 73 |
75 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { | 74 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { |
76 return true; | 75 return true; |
77 } | 76 } |
78 | 77 |
79 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { | 78 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { |
80 return true; | 79 return true; |
81 } | 80 } |
OLD | NEW |