chrome/browser/content_settings/permission_queue_controller.cc - Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS.

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/content_settings/permission_queue_controller.cc

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only 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 | « chrome/browser/content_settings/permission_bubble_request_impl.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_queue_controller.cc

diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc

index 19048ad48ddb8b7d687bcf938382eede81f20c5a..9747ce78d9a4833ec78bc44c893464560a5a8a3f 100644

--- a/chrome/browser/content_settings/permission_queue_controller.cc

+++ b/chrome/browser/content_settings/permission_queue_controller.cc

@@ -24,7 +24,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/common/url_constants.h"

-#if defined(OS_ANDROID)

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

#include "chrome/browser/media/protected_media_identifier_infobar_delegate.h"

#endif

@@ -120,7 +120,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(

GetInfoBarService(id_), controller, id_, requesting_frame_,

display_languages, type_);

break;

-#if defined(OS_ANDROID)

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

case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

infobar_ = ProtectedMediaIdentifierInfoBarDelegate::Create(

GetInfoBarService(id_), controller, id_, requesting_frame_,