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

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

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile & deps Created 7 years, 7 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 | Annotate | Revision Log
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/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
12 #include "chrome/browser/profiles/profile_keyed_service.h" 13 #include "chrome/browser/profiles/profile_keyed_service.h"
13 #include "chrome/common/chrome_paths.h" 14 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
15 #include "components/user_prefs/pref_registry_syncable.h" 16 #include "components/user_prefs/pref_registry_syncable.h"
16 17
17 // static 18 // static
18 PluginPrefsFactory* PluginPrefsFactory::GetInstance() { 19 PluginPrefsFactory* PluginPrefsFactory::GetInstance() {
19 return Singleton<PluginPrefsFactory>::get(); 20 return Singleton<PluginPrefsFactory>::get();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 registry->RegisterListPref(prefs::kPluginsPluginsList, 73 registry->RegisterListPref(prefs::kPluginsPluginsList,
73 PrefRegistrySyncable::UNSYNCABLE_PREF); 74 PrefRegistrySyncable::UNSYNCABLE_PREF);
74 registry->RegisterListPref(prefs::kPluginsDisabledPlugins, 75 registry->RegisterListPref(prefs::kPluginsDisabledPlugins,
75 PrefRegistrySyncable::UNSYNCABLE_PREF); 76 PrefRegistrySyncable::UNSYNCABLE_PREF);
76 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions, 77 registry->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
77 PrefRegistrySyncable::UNSYNCABLE_PREF); 78 PrefRegistrySyncable::UNSYNCABLE_PREF);
78 registry->RegisterListPref(prefs::kPluginsEnabledPlugins, 79 registry->RegisterListPref(prefs::kPluginsEnabledPlugins,
79 PrefRegistrySyncable::UNSYNCABLE_PREF); 80 PrefRegistrySyncable::UNSYNCABLE_PREF);
80 } 81 }
81 82
82 bool PluginPrefsFactory::ServiceRedirectedInIncognito() const { 83 content::BrowserContext* PluginPrefsFactory::GetBrowserContextToUse(
83 return true; 84 content::BrowserContext* context) const {
85 return chrome::GetBrowserContextRedirectedInIncognito(context);
84 } 86 }
85 87
86 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const { 88 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {
87 return true; 89 return true;
88 } 90 }
89 91
90 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const { 92 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const {
91 return true; 93 return true;
92 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698