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

Side by Side Diff: content/renderer/pepper/pepper_in_process_resource_creation.cc

Issue 10944005: Pepper WebSocket API: Implement new design Chrome IPC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 8 years, 2 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/renderer/pepper/pepper_in_process_resource_creation.h" 5 #include "content/renderer/pepper/pepper_in_process_resource_creation.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "content/renderer/render_view_impl.h" 10 #include "content/renderer/render_view_impl.h"
11 #include "content/renderer/pepper/pepper_in_process_router.h" 11 #include "content/renderer/pepper/pepper_in_process_router.h"
12 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 12 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
13 #include "ipc/ipc_message.h" 13 #include "ipc/ipc_message.h"
14 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
15 #include "ppapi/host/ppapi_host.h" 15 #include "ppapi/host/ppapi_host.h"
16 #include "ppapi/proxy/file_chooser_resource.h" 16 #include "ppapi/proxy/file_chooser_resource.h"
17 #include "ppapi/proxy/ppapi_messages.h" 17 #include "ppapi/proxy/ppapi_messages.h"
18 #include "ppapi/proxy/printing_resource.h" 18 #include "ppapi/proxy/printing_resource.h"
19 #include "ppapi/proxy/url_request_info_resource.h" 19 #include "ppapi/proxy/url_request_info_resource.h"
20 #include "ppapi/proxy/websocket_resource.h"
20 #include "ppapi/shared_impl/ppapi_globals.h" 21 #include "ppapi/shared_impl/ppapi_globals.h"
21 #include "ppapi/shared_impl/ppapi_permissions.h" 22 #include "ppapi/shared_impl/ppapi_permissions.h"
22 #include "ppapi/shared_impl/resource_tracker.h" 23 #include "ppapi/shared_impl/resource_tracker.h"
23 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 24 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
24 25
25 // Note that the code in the creation functions in this file should generally 26 // Note that the code in the creation functions in this file should generally
26 // be the same as that in ppapi/proxy/resource_creation_proxy.cc. See 27 // be the same as that in ppapi/proxy/resource_creation_proxy.cc. See
27 // pepper_in_process_resource_creation.h for what this file is for. 28 // pepper_in_process_resource_creation.h for what this file is for.
28 29
29 namespace content { 30 namespace content {
(...skipping 27 matching lines...) Expand all
57 } 58 }
58 59
59 PP_Resource PepperInProcessResourceCreation::CreateURLRequestInfo( 60 PP_Resource PepperInProcessResourceCreation::CreateURLRequestInfo(
60 PP_Instance instance, 61 PP_Instance instance,
61 const ::ppapi::URLRequestInfoData& data) { 62 const ::ppapi::URLRequestInfoData& data) {
62 return (new ppapi::proxy::URLRequestInfoResource( 63 return (new ppapi::proxy::URLRequestInfoResource(
63 host_impl_->in_process_router()->GetPluginConnection(), 64 host_impl_->in_process_router()->GetPluginConnection(),
64 instance, data))->GetReference(); 65 instance, data))->GetReference();
65 } 66 }
66 67
68 PP_Resource PepperInProcessResourceCreation::CreateWebSocket(
69 PP_Instance instance) {
70 return (new ppapi::proxy::WebSocketResource(
71 host_impl_->in_process_router()->GetPluginConnection(),
72 instance))->GetReference();
73 }
74
67 } // namespace content 75 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_in_process_resource_creation.h ('k') | content/renderer/pepper/pepper_websocket_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698