| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "content/public/browser/browser_message_filter.h" | 13 #include "content/public/browser/browser_message_filter.h" |
| 14 #include "ppapi/c/pp_instance.h" | 14 #include "ppapi/c/pp_instance.h" |
| 15 #include "ppapi/c/pp_resource.h" | 15 #include "ppapi/c/pp_resource.h" |
| 16 #include "ppapi/shared_impl/file_ref_detailed_info.h" | |
| 17 | 16 |
| 18 class GURL; | 17 class GURL; |
| 19 | 18 |
| 20 namespace ppapi { | 19 namespace ppapi { |
| 21 namespace proxy { | 20 namespace proxy { |
| 22 class ResourceMessageCallParams; | 21 class ResourceMessageCallParams; |
| 23 } | 22 } |
| 24 } | 23 } |
| 25 | 24 |
| 26 namespace content { | 25 namespace content { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 54 const ppapi::proxy::ResourceMessageCallParams& params, | 53 const ppapi::proxy::ResourceMessageCallParams& params, |
| 55 PP_Instance instance, | 54 PP_Instance instance, |
| 56 const std::vector<IPC::Message>& nested_msgs); | 55 const std::vector<IPC::Message>& nested_msgs); |
| 57 | 56 |
| 58 void OnMsgFileRefGetInfoForRenderer( | 57 void OnMsgFileRefGetInfoForRenderer( |
| 59 int routing_id, | 58 int routing_id, |
| 60 int child_process_id, | 59 int child_process_id, |
| 61 int32_t sequence_num, | 60 int32_t sequence_num, |
| 62 const std::vector<PP_Resource>& resources); | 61 const std::vector<PP_Resource>& resources); |
| 63 | 62 |
| 64 void OnMsgFileRefSyncGetInfoForRenderer( | |
| 65 int child_process_id, | |
| 66 const std::vector<PP_Resource>& resources, | |
| 67 std::vector<ppapi::FileRefDetailedInfo>* out_infos); | |
| 68 | |
| 69 void OnMsgDidCreateInProcessInstance( | 63 void OnMsgDidCreateInProcessInstance( |
| 70 PP_Instance instance, | 64 PP_Instance instance, |
| 71 const PepperRendererInstanceData& instance_data); | 65 const PepperRendererInstanceData& instance_data); |
| 72 void OnMsgDidDeleteInProcessInstance(PP_Instance instance); | 66 void OnMsgDidDeleteInProcessInstance(PP_Instance instance); |
| 73 | 67 |
| 74 int render_process_id_; | 68 int render_process_id_; |
| 75 | 69 |
| 76 // We have a single BrowserPpapiHost per-renderer for all in-process plugins | 70 // We have a single BrowserPpapiHost per-renderer for all in-process plugins |
| 77 // running. This is just a work-around allowing new style resources to work | 71 // running. This is just a work-around allowing new style resources to work |
| 78 // with the browser when running in-process but it means that plugin-specific | 72 // with the browser when running in-process but it means that plugin-specific |
| 79 // information (like the plugin name) won't be available. | 73 // information (like the plugin name) won't be available. |
| 80 scoped_ptr<BrowserPpapiHostImpl> in_process_host_; | 74 scoped_ptr<BrowserPpapiHostImpl> in_process_host_; |
| 81 | 75 |
| 82 DISALLOW_COPY_AND_ASSIGN(PepperRendererConnection); | 76 DISALLOW_COPY_AND_ASSIGN(PepperRendererConnection); |
| 83 }; | 77 }; |
| 84 | 78 |
| 85 } // namespace content | 79 } // namespace content |
| 86 | 80 |
| 87 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ | 81 #endif // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_RENDERER_CONNECTION_H_ |
| OLD | NEW |