| Index: content/ppapi_plugin/ppapi_plugin_main.cc
|
| ===================================================================
|
| --- content/ppapi_plugin/ppapi_plugin_main.cc (revision 84503)
|
| +++ content/ppapi_plugin/ppapi_plugin_main.cc (working copy)
|
| @@ -3,6 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/command_line.h"
|
| +#include "base/debug/debugger.h"
|
| #include "base/message_loop.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "build/build_config.h"
|
| @@ -12,11 +13,32 @@
|
| #include "content/ppapi_plugin/ppapi_thread.h"
|
| #include "ppapi/proxy/proxy_module.h"
|
|
|
| +#if defined(OS_WIN)
|
| +#include "sandbox/src/sandbox.h"
|
| +#endif
|
| +
|
| +#if defined(OS_WIN)
|
| +sandbox::TargetServices* g_target_services = NULL;
|
| +#else
|
| +void* g_target_services = 0;
|
| +#endif
|
| +
|
| // Main function for starting the PPAPI plugin process.
|
| int PpapiPluginMain(const MainFunctionParams& parameters) {
|
| const CommandLine& command_line = parameters.command_line_;
|
| +
|
| +#if defined(OS_WIN)
|
| + g_target_services = parameters.sandbox_info_.TargetServices();
|
| +#endif
|
| +
|
| + // If |g_target_services| is not null this process is sandboxed. One side
|
| + // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger()
|
| + // does.
|
| if (command_line.HasSwitch(switches::kPpapiStartupDialog)) {
|
| - ChildProcess::WaitForDebugger("Ppapi");
|
| + if (g_target_services)
|
| + base::debug::WaitForDebugger(2*60, false);
|
| + else
|
| + ChildProcess::WaitForDebugger("Ppapi");
|
| }
|
|
|
| MessageLoop main_message_loop(MessageLoop::TYPE_UI);
|
|
|