chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc - Issue 24039002: Pepper API implementation for output protection.

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/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

Issue 24039002: Pepper API implementation for output protection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: add test Created 7 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/component_updater/ppapi_utils.cc ('k') | chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h » ('j') | chrome/test/ppapi/ppapi_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

index f7b48f74a00ae5f772c5915c256d4432d9c4ef16..0901e54ed984e3bb4366797feb9e25beb96ef669 100644

--- a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

+++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"

#include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"

#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"

+#include "chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h"

#include "chrome/browser/renderer_host/pepper/pepper_talk_host.h"

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

#include "ppapi/host/message_filter_host.h"

@@ -73,6 +74,15 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost(

case PpapiHostMsg_Talk_Create::ID:

return scoped_ptr<ResourceHost>(new PepperTalkHost(

host_, instance, params.pp_resource()));

+#if defined(OS_CHROMEOS)

+ case PpapiHostMsg_OutputProtection_Create::ID: {

+ scoped_refptr<ResourceMessageFilter> output_protection_filter(

+ new PepperOutputProtectionMessageFilter());

+ return scoped_ptr<ResourceHost>(new MessageFilterHost(

+ host_->GetPpapiHost(), instance, params.pp_resource(),

+ output_protection_filter));

+ }

+#endif

}