chrome/browser/media/media_stream_camera_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/media_stream_camera_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/media_stream_camera_permission_context_factory.h ('k') | chrome/browser/media/media_stream_device_permission_context_unittest.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.cc

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

index a5afebe31d32e9c622a556f7f7e370b754979afa..dc402b8c1e16ae42eac47f96b58ce963a784b8e5 100644

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

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

@@ -11,7 +11,7 @@

MediaStreamCameraPermissionContextFactory::

MediaStreamCameraPermissionContextFactory()

- : BrowserContextKeyedServiceFactory(

+ : PermissionContextFactoryBase(

"MediaStreamCameraPermissionContext",

BrowserContextDependencyManager::GetInstance()) {}

@@ -25,12 +25,6 @@ MediaStreamCameraPermissionContextFactory::BuildServiceInstanceFor(

static_cast<Profile*>(profile), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);

}

-content::BrowserContext*

-MediaStreamCameraPermissionContextFactory::GetBrowserContextToUse(

- content::BrowserContext* context) const {

- return chrome::GetBrowserContextOwnInstanceInIncognito(context);

// static

MediaStreamCameraPermissionContextFactory*

MediaStreamCameraPermissionContextFactory::GetInstance() {