chrome/browser/media/media_stream_camera_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/media_stream_camera_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/chrome_media_stream_infobar_browsertest.cc ('k') | chrome/browser/media/media_stream_camera_permission_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_camera_permission_context_factory.h

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

index 1c3a1d1db6018634ef1ce99411f68fe34356e1f2..088ccbd7f1149ae9a5084ee14090bfd3046e1893 100644

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

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

@@ -6,14 +6,14 @@

#define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAMERA_PERMISSION_CONTEXT_FACTORY_H_

#include "base/memory/singleton.h"

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

#include "components/content_settings/core/common/content_settings_types.h"

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

class MediaStreamDevicePermissionContext;

class Profile;

class MediaStreamCameraPermissionContextFactory

- : public BrowserContextKeyedServiceFactory {

+ : public PermissionContextFactoryBase {

public:

static MediaStreamDevicePermissionContext* GetForProfile(Profile* profile);

static MediaStreamCameraPermissionContextFactory* GetInstance();

@@ -28,8 +28,6 @@ class MediaStreamCameraPermissionContextFactory

// BrowserContextKeyedBaseFactory methods:

KeyedService* BuildServiceInstanceFor(

content::BrowserContext* profile) const override;

- content::BrowserContext* GetBrowserContextToUse(

- content::BrowserContext* context) const override;

DISALLOW_COPY_AND_ASSIGN(MediaStreamCameraPermissionContextFactory);

};