diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 21:20:32 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 21:20:32 +0000 |
| commit | 753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b (patch) | |
| tree | 250fd65af314366dcce94d856f74cda639eb094c /remoting | |
| parent | 3c254b86ec4c6ad714f7c2cb3eec768765b0098d (diff) | |
| download | chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.zip chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.tar.gz chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.tar.bz2 | |
Revert "Pepper: Remove trusted plugin loadable module."
The reverted change broke the ChromeOS builder, which depends on the loadable
module file existing. Argh.
This reverts commit b0b91c06bc2ed6afc0611f00d68f72b19dd06d26.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/pepper_entrypoints.cc | 15 | ||||
| -rw-r--r-- | remoting/remoting_client.gypi | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc index 7cd5bf1..c6923e3 100644 --- a/remoting/client/plugin/pepper_entrypoints.cc +++ b/remoting/client/plugin/pepper_entrypoints.cc @@ -11,9 +11,18 @@ #include "ppapi/c/ppb_instance.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" -#include "ppapi/cpp/private/internal_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 { @@ -37,13 +46,13 @@ int32_t PPP_InitializeModule(PP_Module module_id, ChromotingInstance::RegisterLogMessageHandler(); #endif - pp::InternalSetModuleSingleton(module); + g_module_singleton = module; return PP_OK; } void PPP_ShutdownModule() { delete pp::Module::Get(); - pp::InternalSetModuleSingleton(NULL); + g_module_singleton = NULL; } const void* PPP_GetInterface(const char* interface_name) { diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index d7d66f1..abfc4dc 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -14,7 +14,6 @@ 'dependencies': [ '../net/net.gyp:net', '../ppapi/ppapi.gyp:ppapi_cpp_objects', - '../ppapi/ppapi.gyp:ppapi_internal_module', '../third_party/webrtc/modules/modules.gyp:desktop_capture', '../ui/events/events.gyp:dom4_keycode_converter', 'remoting_base', |