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

Side by Side Diff: chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc

Issue 2095963004: Revert of media: Add OutputProtectionProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 5 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h" 8 #include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
9 #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h" 9 #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
10 #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_fil ter.h" 10 #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_fil ter.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
55 case PpapiHostMsg_PlatformVerification_Create::ID: { 55 case PpapiHostMsg_PlatformVerification_Create::ID: {
56 scoped_refptr<ResourceMessageFilter> pv_filter( 56 scoped_refptr<ResourceMessageFilter> pv_filter(
57 new chrome::PepperPlatformVerificationMessageFilter(host_, 57 new chrome::PepperPlatformVerificationMessageFilter(host_,
58 instance)); 58 instance));
59 return std::unique_ptr<ResourceHost>(new MessageFilterHost( 59 return std::unique_ptr<ResourceHost>(new MessageFilterHost(
60 host_->GetPpapiHost(), instance, resource, pv_filter)); 60 host_->GetPpapiHost(), instance, resource, pv_filter));
61 } 61 }
62 #endif 62 #endif
63 #if defined(OS_CHROMEOS)
63 case PpapiHostMsg_OutputProtection_Create::ID: { 64 case PpapiHostMsg_OutputProtection_Create::ID: {
64 scoped_refptr<ResourceMessageFilter> output_protection_filter( 65 scoped_refptr<ResourceMessageFilter> output_protection_filter(
65 new chrome::PepperOutputProtectionMessageFilter(host_, instance)); 66 new chrome::PepperOutputProtectionMessageFilter(host_, instance));
66 return std::unique_ptr<ResourceHost>( 67 return std::unique_ptr<ResourceHost>(
67 new MessageFilterHost(host_->GetPpapiHost(), instance, resource, 68 new MessageFilterHost(host_->GetPpapiHost(), instance, resource,
68 output_protection_filter)); 69 output_protection_filter));
69 } 70 }
71 #endif
70 } 72 }
71 } 73 }
72 74
73 // Flash interfaces. 75 // Flash interfaces.
74 if (host_->GetPpapiHost()->permissions().HasPermission( 76 if (host_->GetPpapiHost()->permissions().HasPermission(
75 ppapi::PERMISSION_FLASH)) { 77 ppapi::PERMISSION_FLASH)) {
76 switch (message.type()) { 78 switch (message.type()) {
77 case PpapiHostMsg_Flash_Create::ID: 79 case PpapiHostMsg_Flash_Create::ID:
78 return std::unique_ptr<ResourceHost>( 80 return std::unique_ptr<ResourceHost>(
79 new chrome::PepperFlashBrowserHost(host_, instance, resource)); 81 new chrome::PepperFlashBrowserHost(host_, instance, resource));
(...skipping 19 matching lines...) Expand all
99 chrome::PepperIsolatedFileSystemMessageFilter* isolated_fs_filter = 101 chrome::PepperIsolatedFileSystemMessageFilter* isolated_fs_filter =
100 chrome::PepperIsolatedFileSystemMessageFilter::Create(instance, host_); 102 chrome::PepperIsolatedFileSystemMessageFilter::Create(instance, host_);
101 if (!isolated_fs_filter) 103 if (!isolated_fs_filter)
102 return std::unique_ptr<ResourceHost>(); 104 return std::unique_ptr<ResourceHost>();
103 return std::unique_ptr<ResourceHost>( 105 return std::unique_ptr<ResourceHost>(
104 new MessageFilterHost(host, instance, resource, isolated_fs_filter)); 106 new MessageFilterHost(host, instance, resource, isolated_fs_filter));
105 } 107 }
106 108
107 return std::unique_ptr<ResourceHost>(); 109 return std::unique_ptr<ResourceHost>();
108 } 110 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698