| 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 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ | 5 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ |
| 6 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ | 6 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include <stdint.h> |
| 9 |
| 9 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/macros.h" |
| 10 #include "ppapi/c/ppp_instance.h" | 12 #include "ppapi/c/ppp_instance.h" |
| 11 #include "ppapi/shared_impl/ppapi_shared_export.h" | 13 #include "ppapi/shared_impl/ppapi_shared_export.h" |
| 12 | 14 |
| 13 namespace ppapi { | 15 namespace ppapi { |
| 14 | 16 |
| 15 // This exposes the 1.1 interface and forwards it to the 1.0 interface is | 17 // This exposes the 1.1 interface and forwards it to the 1.0 interface is |
| 16 // necessary. | 18 // necessary. |
| 17 struct PPAPI_SHARED_EXPORT PPP_Instance_Combined { | 19 struct PPAPI_SHARED_EXPORT PPP_Instance_Combined { |
| 18 public: | 20 public: |
| 19 // Create a PPP_Instance_Combined. Uses the given |get_interface_func| to | 21 // Create a PPP_Instance_Combined. Uses the given |get_interface_func| to |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 void (*did_change_view_1_0_)(PP_Instance instance, | 55 void (*did_change_view_1_0_)(PP_Instance instance, |
| 54 const struct PP_Rect* position, | 56 const struct PP_Rect* position, |
| 55 const struct PP_Rect* clip); | 57 const struct PP_Rect* clip); |
| 56 | 58 |
| 57 DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined); | 59 DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined); |
| 58 }; | 60 }; |
| 59 | 61 |
| 60 } // namespace ppapi | 62 } // namespace ppapi |
| 61 | 63 |
| 62 #endif // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ | 64 #endif // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ |
| OLD | NEW |