chrome/browser/chrome_content_browser_client.cc - Issue 881023002: media: Rename PERMISSION_PROTECTED_MEDIA to PERMISSION_PROTECTED_MEDIA_IDENTIFIER.

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/chrome_content_browser_client.cc

Issue 881023002: media: Rename PERMISSION_PROTECTED_MEDIA to PERMISSION_PROTECTED_MEDIA_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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 | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 8cadba99197d6371540b17a3d25e12eaf3c6619d..b6e6de5ecbbf505c069ddec6b2190416543aff33 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1913,7 +1913,7 @@ void ChromeContentBrowserClient::RequestPermission(

user_gesture,

result_callback);

break;

- case content::PERMISSION_PROTECTED_MEDIA:

+ case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:

#if defined(OS_ANDROID)

ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)

->RequestPermission(web_contents,

@@ -1962,7 +1962,7 @@ content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(

case content::PERMISSION_GEOLOCATION:

context = GeolocationPermissionContextFactory::GetForProfile(profile);

break;

- case content::PERMISSION_PROTECTED_MEDIA:

+ case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:

#if defined(OS_ANDROID)

context = ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(

profile);

@@ -2018,7 +2018,7 @@ void ChromeContentBrowserClient::CancelPermissionRequest(

GeolocationPermissionContextFactory::GetForProfile(profile)

->CancelPermissionRequest(web_contents, request_id);

break;

- case content::PERMISSION_PROTECTED_MEDIA:

+ case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:

#if defined(OS_ANDROID)

ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)

->CancelPermissionRequest(web_contents, request_id);

@@ -2048,7 +2048,7 @@ static ContentSettingsType PermissionToContentSetting(

case content::PERMISSION_GEOLOCATION:

return CONTENT_SETTINGS_TYPE_GEOLOCATION;

#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

- case content::PERMISSION_PROTECTED_MEDIA:

+ case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:

return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;

#endif

default:

« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client_unittest.cc » ('j') | no next file with comments »