Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: chrome/browser/media/protected_media_identifier_permission_context.cc

Issue 107413006: Dismiss EME infobar when WebMediaPlayer is destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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/media/protected_media_identifier_permission_context.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index e56b41a8c47922fd581032e33827f6ff72a99ba9..18d92bcde15852b307c64b82fd7f3ceec3baeacc 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -43,6 +43,7 @@ void ProtectedMediaIdentifierPermissionContext::
RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
+ int bridge_id,
const GURL& requesting_frame,
const base::Callback<void(bool)>& callback) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -51,7 +52,7 @@ void ProtectedMediaIdentifierPermissionContext::
content::WebContents* web_contents =
tab_util::GetWebContentsByID(render_process_id, render_view_id);
- const PermissionRequestID id(render_process_id, render_view_id, 0);
+ const PermissionRequestID id(render_process_id, render_view_id, bridge_id);
if (extensions::GetViewType(web_contents) !=
extensions::VIEW_TYPE_TAB_CONTENTS) {
@@ -82,9 +83,10 @@ void ProtectedMediaIdentifierPermissionContext::
CancelProtectedMediaIdentifierPermissionRequest(
int render_process_id,
int render_view_id,
+ int bridge_id,
const GURL& requesting_frame) {
CancelPendingInfoBarRequest(
- PermissionRequestID(render_process_id, render_view_id, 0));
+ PermissionRequestID(render_process_id, render_view_id, bridge_id));
}
void ProtectedMediaIdentifierPermissionContext::DecidePermission(

Powered by Google App Engine
This is Rietveld 408576698