| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 plugin_prefs->SetPrefs(profile->GetPrefs()); | 50 plugin_prefs->SetPrefs(profile->GetPrefs()); |
| 51 return plugin_prefs; | 51 return plugin_prefs; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void PluginPrefsFactory::RegisterProfilePrefs( | 54 void PluginPrefsFactory::RegisterProfilePrefs( |
| 55 user_prefs::PrefRegistrySyncable* registry) { | 55 user_prefs::PrefRegistrySyncable* registry) { |
| 56 base::FilePath internal_dir; | 56 base::FilePath internal_dir; |
| 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::kNpapiFlashMigratedToPepperFlash, false); |
| 61 registry->RegisterBooleanPref( | |
| 62 prefs::kPluginsRemovedOldComponentPepperFlashSettings, false); | |
| 63 registry->RegisterListPref(prefs::kPluginsPluginsList); | 61 registry->RegisterListPref(prefs::kPluginsPluginsList); |
| 64 registry->RegisterListPref(prefs::kPluginsDisabledPlugins); | 62 registry->RegisterListPref(prefs::kPluginsDisabledPlugins); |
| 65 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); | 63 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); |
| 66 registry->RegisterListPref(prefs::kPluginsEnabledPlugins); | 64 registry->RegisterListPref(prefs::kPluginsEnabledPlugins); |
| 67 } | 65 } |
| 68 | 66 |
| 69 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( | 67 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse( |
| 70 content::BrowserContext* context) const { | 68 content::BrowserContext* context) const { |
| 71 return chrome::GetBrowserContextRedirectedInIncognito(context); | 69 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 72 } | 70 } |
| 73 | 71 |
| 74 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { | 72 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { |
| 75 return true; | 73 return true; |
| 76 } | 74 } |
| 77 | 75 |
| 78 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { | 76 bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const { |
| 79 return true; | 77 return true; |
| 80 } | 78 } |
| OLD | NEW |