| Index: webkit/plugins/ppapi/plugin_module.cc
|
| diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
|
| index 87bc066d362a29010f16df3f09c5dd50c1868498..0d2fbcd7351a710512edf77235e58a05d95243c1 100644
|
| --- a/webkit/plugins/ppapi/plugin_module.cc
|
| +++ b/webkit/plugins/ppapi/plugin_module.cc
|
| @@ -84,6 +84,7 @@
|
| #include "ppapi/c/trusted/ppb_image_data_trusted.h"
|
| #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
|
| #include "ppapi/shared_impl/input_event_impl.h"
|
| +#include "ppapi/shared_impl/ppb_var_impl.h"
|
| #include "ppapi/shared_impl/time_conversion.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "ppapi/thunk/thunk.h"
|
| @@ -109,7 +110,7 @@
|
| #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
|
| -#include "webkit/plugins/ppapi/ppb_var_impl.h"
|
| +#include "webkit/plugins/ppapi/ppb_var_deprecated_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_video_capture_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
|
| @@ -322,9 +323,11 @@ const void* GetInterface(const char* name) {
|
| if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
|
| return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk();
|
| if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
|
| - return PPB_Var_Impl::GetVarDeprecatedInterface();
|
| + return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface();
|
| if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
|
| - return PPB_Var_Impl::GetVarInterface();
|
| + return ::ppapi::PPB_Var_Impl::GetVarInterface1_0();
|
| + if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0)
|
| + return ::ppapi::PPB_Var_Impl::GetVarInterface();
|
|
|
| #ifdef ENABLE_FLAPPER_HACKS
|
| if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
|
|
|