| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
|
| index 2e2256b4ad0b2888a6b9515ee909e50c87f1ed42..5d15d2b80475f6cacbb21a3ac80fee7c778a72fa 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_gamepad.cc
|
| @@ -7,7 +7,6 @@
|
| #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
|
| #include "native_client/src/shared/ppapi_proxy/utility.h"
|
| #include "ppapi/c/pp_size.h"
|
| -#include "ppapi/c/dev/ppb_fullscreen_dev.h"
|
| #include "srpcgen/ppb_rpc.h"
|
|
|
| namespace ppapi_proxy {
|
| @@ -15,16 +14,16 @@ namespace ppapi_proxy {
|
| namespace {
|
|
|
| void SampleGamepads(PP_Instance instance,
|
| - struct PP_GamepadsSampleData_Dev* pads) {
|
| + struct PP_GamepadsSampleData* pads) {
|
| DebugPrintf("PPB_Gamepad::SampleGamepads: instance=%"NACL_PRId32"\n",
|
| instance);
|
| if (pads == NULL)
|
| return;
|
|
|
| nacl_abi_size_t pads_bytes =
|
| - static_cast<nacl_abi_size_t>(sizeof(struct PP_GamepadsSampleData_Dev));
|
| + static_cast<nacl_abi_size_t>(sizeof(struct PP_GamepadsSampleData));
|
| NaClSrpcError srpc_result =
|
| - PpbGamepadRpcClient::PPB_Gamepad_SampleGamepads(
|
| + PpbGamepadRpcClient::PPB_Gamepad_Sample(
|
| GetMainSrpcChannel(),
|
| instance,
|
| &pads_bytes,
|
| @@ -38,8 +37,8 @@ void SampleGamepads(PP_Instance instance,
|
|
|
| } // namespace
|
|
|
| -const PPB_Gamepad_Dev* PluginGamepad::GetInterface() {
|
| - static const PPB_Gamepad_Dev gamepad_interface = {
|
| +const PPB_Gamepad* PluginGamepad::GetInterface() {
|
| + static const PPB_Gamepad gamepad_interface = {
|
| SampleGamepads
|
| };
|
| return &gamepad_interface;
|
|
|