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

Side by Side Diff: chrome/browser/permissions/permission_manager_factory.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/permissions/permission_manager_factory.h" 5 #include "chrome/browser/permissions/permission_manager_factory.h"
6 6
7 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
7 #include "chrome/browser/permissions/permission_context.h" 8 #include "chrome/browser/permissions/permission_context.h"
8 #include "chrome/browser/permissions/permission_manager.h" 9 #include "chrome/browser/permissions/permission_manager.h"
9 #include "chrome/browser/profiles/incognito_helpers.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 "components/keyed_service/content/browser_context_dependency_manager.h" 12 #include "components/keyed_service/content/browser_context_dependency_manager.h"
12 13
13 // static 14 // static
14 PermissionManager* 15 PermissionManager*
15 PermissionManagerFactory::GetForProfile(Profile* profile) { 16 PermissionManagerFactory::GetForProfile(Profile* profile) {
16 return static_cast<PermissionManager*>( 17 return static_cast<PermissionManager*>(
17 GetInstance()->GetServiceForBrowserContext(profile, true)); 18 GetInstance()->GetServiceForBrowserContext(profile, true));
18 } 19 }
19 20
20 // static 21 // static
21 PermissionManagerFactory* PermissionManagerFactory::GetInstance() { 22 PermissionManagerFactory* PermissionManagerFactory::GetInstance() {
22 return base::Singleton<PermissionManagerFactory>::get(); 23 return base::Singleton<PermissionManagerFactory>::get();
23 } 24 }
24 25
25 PermissionManagerFactory::PermissionManagerFactory() 26 PermissionManagerFactory::PermissionManagerFactory()
26 : BrowserContextKeyedServiceFactory( 27 : BrowserContextKeyedServiceFactory(
27 "PermissionManagerFactory", 28 "PermissionManagerFactory",
28 BrowserContextDependencyManager::GetInstance()) { 29 BrowserContextDependencyManager::GetInstance()) {
30 DependsOn(HostContentSettingsMapFactory::GetInstance());
29 for (KeyedServiceBaseFactory* factory : PermissionContext::GetFactories()) 31 for (KeyedServiceBaseFactory* factory : PermissionContext::GetFactories())
30 DependsOn(factory); 32 DependsOn(factory);
31 } 33 }
32 34
33 PermissionManagerFactory::~PermissionManagerFactory() { 35 PermissionManagerFactory::~PermissionManagerFactory() {
34 } 36 }
35 37
36 KeyedService* PermissionManagerFactory::BuildServiceInstanceFor( 38 KeyedService* PermissionManagerFactory::BuildServiceInstanceFor(
37 content::BrowserContext* context) const { 39 content::BrowserContext* context) const {
38 return new PermissionManager(Profile::FromBrowserContext(context)); 40 return new PermissionManager(Profile::FromBrowserContext(context));
39 } 41 }
40 42
41 content::BrowserContext* 43 content::BrowserContext*
42 PermissionManagerFactory::GetBrowserContextToUse( 44 PermissionManagerFactory::GetBrowserContextToUse(
43 content::BrowserContext* context) const { 45 content::BrowserContext* context) const {
44 return chrome::GetBrowserContextOwnInstanceInIncognito(context); 46 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
45 } 47 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | chrome/browser/permissions/permission_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698