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

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

Issue 1307173009: rebased ppapi vpnProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: fix compile Created 5 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 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 "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 "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 7 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
8 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h" 8 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h"
9 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h" 9 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
10 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" 10 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
11 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h " 11 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h "
12 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h" 12 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h"
13 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" 13 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
14 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h" 14 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h"
15 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h" 15 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h"
16 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h" 16 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h"
17 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" 17 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
18 #include "content/browser/renderer_host/pepper/pepper_printing_host.h" 18 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
19 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h" 19 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h"
20 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h" 20 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h"
21 #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h" 21 #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h"
22 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h" 22 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
23 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h" 23 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h"
24 #include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filte r_chromeos.h"
24 #include "ppapi/host/message_filter_host.h" 25 #include "ppapi/host/message_filter_host.h"
25 #include "ppapi/host/ppapi_host.h" 26 #include "ppapi/host/ppapi_host.h"
26 #include "ppapi/host/resource_host.h" 27 #include "ppapi/host/resource_host.h"
27 #include "ppapi/proxy/ppapi_messages.h" 28 #include "ppapi/proxy/ppapi_messages.h"
28 #include "ppapi/shared_impl/ppapi_permissions.h" 29 #include "ppapi/shared_impl/ppapi_permissions.h"
29 30
30 using ppapi::host::MessageFilterHost; 31 using ppapi::host::MessageFilterHost;
31 using ppapi::host::ResourceHost; 32 using ppapi::host::ResourceHost;
32 using ppapi::host::ResourceMessageFilter; 33 using ppapi::host::ResourceMessageFilter;
33 using ppapi::proxy::SerializedTrueTypeFontDesc; 34 using ppapi::proxy::SerializedTrueTypeFontDesc;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 if (!base::IsStringUTF8(desc.family)) 148 if (!base::IsStringUTF8(desc.family))
148 return scoped_ptr<ResourceHost>(); 149 return scoped_ptr<ResourceHost>();
149 150
150 return scoped_ptr<ResourceHost>( 151 return scoped_ptr<ResourceHost>(
151 new PepperTrueTypeFontHost(host_, instance, resource, desc)); 152 new PepperTrueTypeFontHost(host_, instance, resource, desc));
152 } 153 }
153 case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: { 154 case PpapiHostMsg_TrueTypeFontSingleton_Create::ID: {
154 return scoped_ptr<ResourceHost>( 155 return scoped_ptr<ResourceHost>(
155 new PepperTrueTypeFontListHost(host_, instance, resource)); 156 new PepperTrueTypeFontListHost(host_, instance, resource));
156 } 157 }
158 #if defined(OS_CHROMEOS)
159 case PpapiHostMsg_VpnProvider_Create::ID: {
160 scoped_refptr<PepperVpnProviderMessageFilterChromeOS> vpn_provider(
161 new PepperVpnProviderMessageFilterChromeOS(host_, instance));
162 return scoped_ptr<ResourceHost>(new MessageFilterHost(
163 host_->GetPpapiHost(), instance, resource, vpn_provider));
164 }
165 #endif
157 } 166 }
158 } 167 }
159 168
160 // Private interfaces. 169 // Private interfaces.
161 if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) { 170 if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) {
162 switch (message.type()) { 171 switch (message.type()) {
163 case PpapiHostMsg_BrowserFontSingleton_Create::ID: 172 case PpapiHostMsg_BrowserFontSingleton_Create::ID:
164 return scoped_ptr<ResourceHost>( 173 return scoped_ptr<ResourceHost>(
165 new PepperBrowserFontSingletonHost(host_, instance, resource)); 174 new PepperBrowserFontSingletonHost(host_, instance, resource));
166 } 175 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 return scoped_ptr<ResourceHost>(new MessageFilterHost( 261 return scoped_ptr<ResourceHost>(new MessageFilterHost(
253 host_->GetPpapiHost(), instance, resource, tcp_socket)); 262 host_->GetPpapiHost(), instance, resource, tcp_socket));
254 } 263 }
255 264
256 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions() 265 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions()
257 const { 266 const {
258 return host_->GetPpapiHost()->permissions(); 267 return host_->GetPpapiHost()->permissions();
259 } 268 }
260 269
261 } // namespace content 270 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698