OLD | NEW |
---|---|
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/video_capture_resource.h" | |
20 #include "ppapi/proxy/websocket_resource.h" | 21 #include "ppapi/proxy/websocket_resource.h" |
21 #include "ppapi/shared_impl/ppapi_globals.h" | 22 #include "ppapi/shared_impl/ppapi_globals.h" |
22 #include "ppapi/shared_impl/ppapi_permissions.h" | 23 #include "ppapi/shared_impl/ppapi_permissions.h" |
23 #include "ppapi/shared_impl/resource_tracker.h" | 24 #include "ppapi/shared_impl/resource_tracker.h" |
24 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 25 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
25 | 26 |
26 // Note that the code in the creation functions in this file should generally | 27 // Note that the code in the creation functions in this file should generally |
27 // be the same as that in ppapi/proxy/resource_creation_proxy.cc. See | 28 // be the same as that in ppapi/proxy/resource_creation_proxy.cc. See |
28 // pepper_in_process_resource_creation.h for what this file is for. | 29 // pepper_in_process_resource_creation.h for what this file is for. |
29 | 30 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
65 instance, data))->GetReference(); | 66 instance, data))->GetReference(); |
66 } | 67 } |
67 | 68 |
68 PP_Resource PepperInProcessResourceCreation::CreateWebSocket( | 69 PP_Resource PepperInProcessResourceCreation::CreateWebSocket( |
69 PP_Instance instance) { | 70 PP_Instance instance) { |
70 return (new ppapi::proxy::WebSocketResource( | 71 return (new ppapi::proxy::WebSocketResource( |
71 host_impl_->in_process_router()->GetPluginConnection(), | 72 host_impl_->in_process_router()->GetPluginConnection(), |
72 instance))->GetReference(); | 73 instance))->GetReference(); |
73 } | 74 } |
74 | 75 |
76 PP_Resource PepperInProcessResourceCreation::CreateVideoCapture( | |
77 PP_Instance instance) { | |
78 return 0; // VideoCapture is not supported in process now. | |
yzshen1
2012/10/29 18:34:23
We add those non-supported ones to resource_creati
victorhsieh
2012/10/30 09:43:28
Done.
| |
79 } | |
80 | |
75 } // namespace content | 81 } // namespace content |
OLD | NEW |