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

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

Issue 23514062: Revert r223494 "Simplify PPB_NetworkMonitor proxy." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
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_ref_host.h" 9 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
10 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h " 10 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h "
11 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h" 11 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter. h"
12 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" 12 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
13 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h" 13 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt er.h"
14 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h"
15 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h" 14 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h"
16 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" 15 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
17 #include "content/browser/renderer_host/pepper/pepper_printing_host.h" 16 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
18 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h" 17 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_ filter.h"
19 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h" 18 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter. h"
20 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h" 19 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
21 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h" 20 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter. h"
22 #include "net/socket/stream_socket.h" 21 #include "net/socket/stream_socket.h"
23 #include "ppapi/host/message_filter_host.h" 22 #include "ppapi/host/message_filter_host.h"
24 #include "ppapi/host/ppapi_host.h" 23 #include "ppapi/host/ppapi_host.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 if (message.type() == PpapiHostMsg_UDPSocket_CreatePrivate::ID) { 191 if (message.type() == PpapiHostMsg_UDPSocket_CreatePrivate::ID) {
193 if (CanCreateSocket()) { 192 if (CanCreateSocket()) {
194 scoped_refptr<ResourceMessageFilter> udp_socket( 193 scoped_refptr<ResourceMessageFilter> udp_socket(
195 new PepperUDPSocketMessageFilter(host_, instance, true)); 194 new PepperUDPSocketMessageFilter(host_, instance, true));
196 return scoped_ptr<ResourceHost>(new MessageFilterHost( 195 return scoped_ptr<ResourceHost>(new MessageFilterHost(
197 host_->GetPpapiHost(), instance, params.pp_resource(), udp_socket)); 196 host_->GetPpapiHost(), instance, params.pp_resource(), udp_socket));
198 } else { 197 } else {
199 return scoped_ptr<ResourceHost>(); 198 return scoped_ptr<ResourceHost>();
200 } 199 }
201 } 200 }
202 if (message.type() == PpapiHostMsg_NetworkMonitor_Create::ID) {
203 return scoped_ptr<ResourceHost>(
204 new PepperNetworkMonitorHost(host_, instance, params.pp_resource()));
205 }
206 201
207 // Flash interfaces. 202 // Flash interfaces.
208 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) { 203 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {
209 switch (message.type()) { 204 switch (message.type()) {
210 case PpapiHostMsg_FlashFile_Create::ID: { 205 case PpapiHostMsg_FlashFile_Create::ID: {
211 scoped_refptr<ResourceMessageFilter> file_filter( 206 scoped_refptr<ResourceMessageFilter> file_filter(
212 new PepperFlashFileMessageFilter(instance, host_)); 207 new PepperFlashFileMessageFilter(instance, host_));
213 return scoped_ptr<ResourceHost>(new MessageFilterHost( 208 return scoped_ptr<ResourceHost>(new MessageFilterHost(
214 host_->GetPpapiHost(), instance, params.pp_resource(), 209 host_->GetPpapiHost(), instance, params.pp_resource(),
215 file_filter)); 210 file_filter));
(...skipping 21 matching lines...) Expand all
237 return scoped_ptr<ResourceHost>(new MessageFilterHost( 232 return scoped_ptr<ResourceHost>(new MessageFilterHost(
238 host_->GetPpapiHost(), instance, 0, tcp_socket)); 233 host_->GetPpapiHost(), instance, 0, tcp_socket));
239 } 234 }
240 235
241 const ppapi::PpapiPermissions& 236 const ppapi::PpapiPermissions&
242 ContentBrowserPepperHostFactory::GetPermissions() const { 237 ContentBrowserPepperHostFactory::GetPermissions() const {
243 return host_->GetPpapiHost()->permissions(); 238 return host_->GetPpapiHost()->permissions();
244 } 239 }
245 240
246 } // namespace content 241 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698