chrome/browser/media/protected_media_identifier_permission_context_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/media/protected_media_identifier_permission_context_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media/protected_media_identifier_permission_context_factory.h ('k') | chrome/browser/notifications/desktop_notification_profile_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/protected_media_identifier_permission_context_factory.cc

diff --git a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc

index 3e0ceff0a9524adc3fd01916463106a10e4e77a8..0565a822ef44e70870cff678b8495be1b2741b8f 100644

--- a/chrome/browser/media/protected_media_identifier_permission_context_factory.cc

+++ b/chrome/browser/media/protected_media_identifier_permission_context_factory.cc

@@ -28,7 +28,7 @@ ProtectedMediaIdentifierPermissionContextFactory::GetInstance() {

ProtectedMediaIdentifierPermissionContextFactory::

ProtectedMediaIdentifierPermissionContextFactory()

- : BrowserContextKeyedServiceFactory(

+ : PermissionContextFactoryBase(

"ProtectedMediaIdentifierPermissionContext",

BrowserContextDependencyManager::GetInstance()) {

}

@@ -51,9 +51,3 @@ ProtectedMediaIdentifierPermissionContextFactory::RegisterProfilePrefs(

registry->RegisterBooleanPref(prefs::kProtectedMediaIdentifierEnabled, true);

#endif

}

-content::BrowserContext*

-ProtectedMediaIdentifierPermissionContextFactory::GetBrowserContextToUse(

- content::BrowserContext* context) const {

- return chrome::GetBrowserContextOwnInstanceInIncognito(context);