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

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

Issue 1255943002: One-time migration of NPAPI Flash to PPAPI Flash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use correct plugin name on OS X Created 5 years, 4 months 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
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('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_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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698