chrome/browser/chrome_content_browser_client.cc - Issue 769103002: Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase.

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 769103002: Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanup and fix compile Created 6 years 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

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 4f58d2fba0344ebf080b42057b37b3dc1c8a5d6a..5667ad1211f5f066a0600ce001e0f4a2929d9f00 100644

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

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

@@ -1953,8 +1953,11 @@ void ChromeContentBrowserClient::RequestPermission(

case content::PERMISSION_PROTECTED_MEDIA:

#if defined(OS_ANDROID)

ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)

- ->RequestProtectedMediaIdentifierPermission(

- web_contents, requesting_frame, result_callback);

+ ->RequestPermission(web_contents,

mlamouri (slow - plz ping) 2014/12/02 22:43:30 nit: indentation

timvolodine 2014/12/03 16:44:25 Done.

+ request_id,

+ requesting_frame.GetOrigin(),

+ user_gesture,

+ result_callback);

#else

NOTIMPLEMENTED();

#endif

@@ -2007,8 +2010,7 @@ void ChromeContentBrowserClient::CancelPermissionRequest(

case content::PERMISSION_PROTECTED_MEDIA:

#if defined(OS_ANDROID)

ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)

- ->CancelProtectedMediaIdentifierPermissionRequests(

- render_process_id, render_view_id, requesting_frame);

+ ->CancelPermissionRequest(web_contents, request_id);

#else

NOTIMPLEMENTED();

#endif

« no previous file with comments | « no previous file | chrome/browser/content_settings/permission_context_base.h » ('j') | chrome/browser/content_settings/permission_context_base.h » ('J')