chrome/browser/permissions/permission_manager_factory.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/permissions/permission_manager_factory.cc

diff --git a/chrome/browser/permissions/permission_manager_factory.cc b/chrome/browser/permissions/permission_manager_factory.cc

index 66a87e31080b1ea6cd952e4cfd619ec75c028bb1..fc12b7ae03da3cba8c6a5dd1d2dbe942d16cfcdb 100644

--- a/chrome/browser/permissions/permission_manager_factory.cc

+++ b/chrome/browser/permissions/permission_manager_factory.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/permissions/permission_manager_factory.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/permissions/permission_context.h"

#include "chrome/browser/permissions/permission_manager.h"

#include "chrome/browser/profiles/incognito_helpers.h"

@@ -26,6 +27,7 @@ PermissionManagerFactory::PermissionManagerFactory()

: BrowserContextKeyedServiceFactory(

"PermissionManagerFactory",

BrowserContextDependencyManager::GetInstance()) {

+ DependsOn(HostContentSettingsMapFactory::GetInstance());

for (KeyedServiceBaseFactory* factory : PermissionContext::GetFactories())

DependsOn(factory);

}