Chromium Code Reviews| 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..157f0f85e3b41939a6fef7e5a0bc1c3f4e5867d7 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_host.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,12 @@ scoped_ptr<ResourceHost> ChromeBrowserPepperHostFactory::CreateResourceHost( |
| case PpapiHostMsg_Talk_Create::ID: |
| return scoped_ptr<ResourceHost>(new PepperTalkHost( |
| host_, instance, params.pp_resource())); |
| +#if defined(USE_ASH) |
|
cpu_(ooo_6.6-7.5)
2013/09/09 17:30:24
I don't see windows implementations so this is not
dmichael (off chromium)
2013/09/09 20:37:15
Why USE_ASH? Should this be OS_CHROMEOS? (And I gu
kcwu
2013/09/10 12:50:21
Do you mean ASH is available on Windows? I think A
kcwu
2013/09/10 12:50:21
Yes, this API is ChromeOS-only. This API is design
kcwu
2013/09/11 07:02:26
Done.
|
| + case PpapiHostMsg_OutputProtection_Create::ID: { |
| + return scoped_ptr<ResourceHost>(new PepperOutputProtectionHost( |
| + host_, instance, params.pp_resource())); |
| + } |
| +#endif |
| } |
| } |