| Index: content/ppapi_plugin/ppapi_thread.h
|
| diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
|
| index 3d80e490c9fb348ca0b43acefe2e0ca3b32444a8..ae86f3df0f091e7d52957e04e983cedcbf8b4e6c 100644
|
| --- a/content/ppapi_plugin/ppapi_thread.h
|
| +++ b/content/ppapi_plugin/ppapi_thread.h
|
| @@ -14,7 +14,7 @@
|
| #include "base/process/process.h"
|
| #include "base/scoped_native_library.h"
|
| #include "build/build_config.h"
|
| -#include "content/child/child_thread.h"
|
| +#include "content/child/child_thread_impl.h"
|
| #include "content/public/common/pepper_plugin_info.h"
|
| #include "ppapi/c/pp_module.h"
|
| #include "ppapi/c/trusted/ppp_broker.h"
|
| @@ -40,7 +40,13 @@ namespace content {
|
|
|
| class PpapiBlinkPlatformImpl;
|
|
|
| -class PpapiThread : public ChildThread,
|
| +#if defined(COMPILER_MSVC)
|
| +// See explanation for other RenderViewHostImpl which is the same issue.
|
| +#pragma warning(push)
|
| +#pragma warning(disable: 4250)
|
| +#endif
|
| +
|
| +class PpapiThread : public ChildThreadImpl,
|
| public ppapi::proxy::PluginDispatcher::PluginDelegate,
|
| public ppapi::proxy::PluginProxyDelegate {
|
| public:
|
| @@ -158,6 +164,10 @@ class PpapiThread : public ChildThread,
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread);
|
| };
|
|
|
| +#if defined(COMPILER_MSVC)
|
| +#pragma warning(pop)
|
| +#endif
|
| +
|
| } // namespace content
|
|
|
| #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
|
|
|