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

Side by Side Diff: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

Issue 2128743002: Reland of ppapi: PPB_VpnProvider: Implement Resource Host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vpn-nacl-sdk
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h" 5 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/memory/ptr_util.h"
10 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 11 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
11 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h" 12 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h"
12 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h" 13 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
13 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" 14 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
14 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h " 15 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h "
15 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h" 16 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h"
16 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" 17 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
17 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h" 18 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h"
18 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h" 19 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h"
19 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h" 20 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h"
20 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" 21 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
21 #include "content/browser/renderer_host/pepper/pepper_printing_host.h" 22 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
22 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h" 23 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h"
23 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h" 24 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h"
24 #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h" 25 #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h"
25 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h" 26 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
26 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h" 27 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h"
27 #include "ppapi/host/message_filter_host.h" 28 #include "ppapi/host/message_filter_host.h"
28 #include "ppapi/host/ppapi_host.h" 29 #include "ppapi/host/ppapi_host.h"
29 #include "ppapi/host/resource_host.h" 30 #include "ppapi/host/resource_host.h"
30 #include "ppapi/proxy/ppapi_messages.h" 31 #include "ppapi/proxy/ppapi_messages.h"
31 #include "ppapi/shared_impl/ppapi_permissions.h" 32 #include "ppapi/shared_impl/ppapi_permissions.h"
32 33
34 #if defined(OS_CHROMEOS)
35 #include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filte r_chromeos.h"
36 #endif
37
33 using ppapi::host::MessageFilterHost; 38 using ppapi::host::MessageFilterHost;
34 using ppapi::host::ResourceHost; 39 using ppapi::host::ResourceHost;
35 using ppapi::host::ResourceMessageFilter; 40 using ppapi::host::ResourceMessageFilter;
36 using ppapi::proxy::SerializedTrueTypeFontDesc; 41 using ppapi::proxy::SerializedTrueTypeFontDesc;
37 using ppapi::UnpackMessage; 42 using ppapi::UnpackMessage;
38 43
39 namespace content { 44 namespace content {
40 45
41 namespace { 46 namespace {
42 47
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (!base::IsStringUTF8(desc.family)) 156 if (!base::IsStringUTF8(desc.family))
152 return std::unique_ptr<ResourceHost>(); 157 return std::unique_ptr<ResourceHost>();
153 158
154 return std::unique_ptr<ResourceHost>( 159 return std::unique_ptr<ResourceHost>(
155 new PepperTrueTypeFontHost(host_, instance, resource, desc)); 160 new PepperTrueTypeFontHost(host_, instance, resource, desc));
156 } 161 }
157 case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: { 162 case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: {
158 return std::unique_ptr<ResourceHost>( 163 return std::unique_ptr<ResourceHost>(
159 new PepperTrueTypeFontListHost(host_, instance, resource)); 164 new PepperTrueTypeFontListHost(host_, instance, resource));
160 } 165 }
166 #if defined(OS_CHROMEOS)
167 case PpapiHostMsg_VpnProvider_Create::ID: {
168 scoped_refptr<PepperVpnProviderMessageFilter> vpn_provider(
169 new PepperVpnProviderMessageFilter(host_, instance));
170 return base::MakeUnique<MessageFilterHost>(
171 host_->GetPpapiHost(), instance, resource, std::move(vpn_provider));
172 }
173 #endif
161 } 174 }
162 } 175 }
163 176
164 // Private interfaces. 177 // Private interfaces.
165 if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) { 178 if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) {
166 switch (message.type()) { 179 switch (message.type()) {
167 case PpapiHostMsg_BrowserFontSingleton_Create::ID: 180 case PpapiHostMsg_BrowserFontSingleton_Create::ID:
168 return std::unique_ptr<ResourceHost>( 181 return std::unique_ptr<ResourceHost>(
169 new PepperBrowserFontSingletonHost(host_, instance, resource)); 182 new PepperBrowserFontSingletonHost(host_, instance, resource));
170 } 183 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 return std::unique_ptr<ResourceHost>(new MessageFilterHost( 269 return std::unique_ptr<ResourceHost>(new MessageFilterHost(
257 host_->GetPpapiHost(), instance, resource, tcp_socket)); 270 host_->GetPpapiHost(), instance, resource, tcp_socket));
258 } 271 }
259 272
260 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions() 273 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions()
261 const { 274 const {
262 return host_->GetPpapiHost()->permissions(); 275 return host_->GetPpapiHost()->permissions();
263 } 276 }
264 277
265 } // namespace content 278 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698