| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ | 5 #ifndef PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ |
| 6 #define PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ | 6 #define PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 #include <vector> | 10 #include <vector> |
| 10 | 11 |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "ppapi/c/pp_instance.h" | 12 #include "ppapi/c/pp_instance.h" |
| 13 #include "ppapi/c/pp_resource.h" | 13 #include "ppapi/c/pp_resource.h" |
| 14 #include "ppapi/c/pp_var.h" | 14 #include "ppapi/c/pp_var.h" |
| 15 #include "ppapi/proxy/interface_proxy.h" | 15 #include "ppapi/proxy/interface_proxy.h" |
| 16 #include "ppapi/shared_impl/host_resource.h" | 16 #include "ppapi/shared_impl/host_resource.h" |
| 17 #include "ppapi/shared_impl/ppp_instance_combined.h" | 17 #include "ppapi/shared_impl/ppp_instance_combined.h" |
| 18 | 18 |
| 19 struct PP_Rect; | 19 struct PP_Rect; |
| 20 | 20 |
| 21 namespace ppapi { | 21 namespace ppapi { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 47 PP_Bool* result); | 47 PP_Bool* result); |
| 48 void OnPluginMsgDidDestroy(PP_Instance instance); | 48 void OnPluginMsgDidDestroy(PP_Instance instance); |
| 49 void OnPluginMsgDidChangeView(PP_Instance instance, | 49 void OnPluginMsgDidChangeView(PP_Instance instance, |
| 50 const ViewData& new_data, | 50 const ViewData& new_data, |
| 51 PP_Bool flash_fullscreen); | 51 PP_Bool flash_fullscreen); |
| 52 void OnPluginMsgDidChangeFocus(PP_Instance instance, PP_Bool has_focus); | 52 void OnPluginMsgDidChangeFocus(PP_Instance instance, PP_Bool has_focus); |
| 53 void OnPluginMsgHandleDocumentLoad(PP_Instance instance, | 53 void OnPluginMsgHandleDocumentLoad(PP_Instance instance, |
| 54 int pending_loader_host_id, | 54 int pending_loader_host_id, |
| 55 const URLResponseInfoData& data); | 55 const URLResponseInfoData& data); |
| 56 | 56 |
| 57 scoped_ptr<PPP_Instance_Combined> combined_interface_; | 57 std::unique_ptr<PPP_Instance_Combined> combined_interface_; |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace proxy | 60 } // namespace proxy |
| 61 } // namespace ppapi | 61 } // namespace ppapi |
| 62 | 62 |
| 63 #endif // PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ | 63 #endif // PPAPI_PROXY_PPP_INSTANCE_PROXY_H_ |
| OLD | NEW |