| Index: remoting/client/plugin/pepper_entrypoints.cc
|
| diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc
|
| index c6923e322a6b084b003f4d83611708e044b99485..70e6ce14c31ec02f832b32526dc2098d7bd99869 100644
|
| --- a/remoting/client/plugin/pepper_entrypoints.cc
|
| +++ b/remoting/client/plugin/pepper_entrypoints.cc
|
| @@ -10,19 +10,10 @@
|
| #include "ppapi/c/pp_module.h"
|
| #include "ppapi/c/ppb_instance.h"
|
| #include "ppapi/cpp/instance.h"
|
| +#include "ppapi/cpp/internal_module.h"
|
| #include "ppapi/cpp/module.h"
|
| #include "remoting/client/plugin/chromoting_instance.h"
|
|
|
| -static pp::Module* g_module_singleton = NULL;
|
| -
|
| -namespace pp {
|
| -
|
| -Module* Module::Get() {
|
| - return g_module_singleton;
|
| -}
|
| -
|
| -} // namespace pp
|
| -
|
| namespace remoting {
|
|
|
| class ChromotingModule : public pp::Module {
|
| @@ -46,13 +37,13 @@ int32_t PPP_InitializeModule(PP_Module module_id,
|
| ChromotingInstance::RegisterLogMessageHandler();
|
| #endif
|
|
|
| - g_module_singleton = module;
|
| + pp::InternalSetModuleSingleton(module);
|
| return PP_OK;
|
| }
|
|
|
| void PPP_ShutdownModule() {
|
| delete pp::Module::Get();
|
| - g_module_singleton = NULL;
|
| + pp::InternalSetModuleSingleton(NULL);
|
| }
|
|
|
| const void* PPP_GetInterface(const char* interface_name) {
|
|
|