chrome/browser/media/protected_media_identifier_permission_context_factory.h - 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.h

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/midi_permission_context_unittest.cc ('k') | chrome/browser/media/protected_media_identifier_permission_context_factory.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.h

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

index 56481874ea47a47af24614f938be1806b9daafd8..fe85a4670586c57d5d0d23c7e4f03f9c5d2ae775 100644

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

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

@@ -6,13 +6,13 @@

#define CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_FACTORY_H_

#include "base/memory/singleton.h"

-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"

+#include "chrome/browser/permissions/permission_context_factory_base.h"

class ProtectedMediaIdentifierPermissionContext;

class Profile;

class ProtectedMediaIdentifierPermissionContextFactory

- : public BrowserContextKeyedServiceFactory {

+ : public PermissionContextFactoryBase {

public:

static ProtectedMediaIdentifierPermissionContext* GetForProfile(

Profile* profile);

@@ -31,8 +31,6 @@ class ProtectedMediaIdentifierPermissionContextFactory

content::BrowserContext* profile) const override;

void RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable* registry) override;

- content::BrowserContext* GetBrowserContextToUse(

- content::BrowserContext* context) const override;

DISALLOW_COPY_AND_ASSIGN(

ProtectedMediaIdentifierPermissionContextFactory);