| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" | 
| 6 #include "base/debug/debugger.h" | 6 #include "base/debug/debugger.h" | 
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" | 
| 8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" | 
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" | 
| 10 #include "content/common/child_process.h" | 10 #include "content/common/child_process.h" | 
| 11 #include "content/ppapi_plugin/ppapi_thread.h" | 11 #include "content/ppapi_plugin/ppapi_thread.h" | 
| 12 #include "content/public/common/content_switches.h" | 12 #include "content/public/common/content_switches.h" | 
| 13 #include "content/public/common/main_function_params.h" | 13 #include "content/public/common/main_function_params.h" | 
| 14 #include "ppapi/proxy/proxy_module.h" | 14 #include "ppapi/proxy/proxy_module.h" | 
| 15 | 15 | 
| 16 #if defined(OS_WIN) | 16 #if defined(OS_WIN) | 
| 17 #include "sandbox/src/sandbox.h" | 17 #include "sandbox/src/sandbox.h" | 
| 18 #endif | 18 #endif | 
| 19 | 19 | 
| 20 #if defined(OS_MACOSX) |  | 
| 21 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface
    .h" |  | 
| 22 #endif |  | 
| 23 |  | 
| 24 #if defined(OS_WIN) | 20 #if defined(OS_WIN) | 
| 25 sandbox::TargetServices* g_target_services = NULL; | 21 sandbox::TargetServices* g_target_services = NULL; | 
| 26 #else | 22 #else | 
| 27 void* g_target_services = 0; | 23 void* g_target_services = 0; | 
| 28 #endif | 24 #endif | 
| 29 | 25 | 
| 30 // Main function for starting the PPAPI plugin process. | 26 // Main function for starting the PPAPI plugin process. | 
| 31 int PpapiPluginMain(const content::MainFunctionParams& parameters) { | 27 int PpapiPluginMain(const content::MainFunctionParams& parameters) { | 
| 32   const CommandLine& command_line = parameters.command_line; | 28   const CommandLine& command_line = parameters.command_line; | 
| 33 | 29 | 
| 34 #if defined(OS_WIN) | 30 #if defined(OS_WIN) | 
| 35   g_target_services = parameters.sandbox_info->target_services; | 31   g_target_services = parameters.sandbox_info->target_services; | 
| 36 #endif | 32 #endif | 
| 37 | 33 | 
| 38   // If |g_target_services| is not null this process is sandboxed. One side | 34   // If |g_target_services| is not null this process is sandboxed. One side | 
| 39   // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger() | 35   // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger() | 
| 40   // does. | 36   // does. | 
| 41   if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { | 37   if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { | 
| 42     if (g_target_services) | 38     if (g_target_services) | 
| 43       base::debug::WaitForDebugger(2*60, false); | 39       base::debug::WaitForDebugger(2*60, false); | 
| 44     else | 40     else | 
| 45       ChildProcess::WaitForDebugger("Ppapi"); | 41       ChildProcess::WaitForDebugger("Ppapi"); | 
| 46   } | 42   } | 
| 47 | 43 | 
| 48 #if defined(OS_MACOSX) |  | 
| 49   // TODO(viettrungluu): This is called in different places in processes that |  | 
| 50   // will run WebKit. This is stupid and error-prone. |  | 
| 51   InitWebCoreSystemInterface(); |  | 
| 52 #endif |  | 
| 53 |  | 
| 54   MessageLoop main_message_loop; | 44   MessageLoop main_message_loop; | 
| 55   base::PlatformThread::SetName("CrPPAPIMain"); | 45   base::PlatformThread::SetName("CrPPAPIMain"); | 
| 56 | 46 | 
| 57   ChildProcess ppapi_process; | 47   ChildProcess ppapi_process; | 
| 58   ppapi_process.set_main_thread(new PpapiThread(false));  // Not a broker. | 48   ppapi_process.set_main_thread(new PpapiThread(false));  // Not a broker. | 
| 59 | 49 | 
| 60   ppapi::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs( | 50   ppapi::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs( | 
| 61       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); | 51       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); | 
| 62 | 52 | 
| 63   main_message_loop.Run(); | 53   main_message_loop.Run(); | 
| 64   return 0; | 54   return 0; | 
| 65 } | 55 } | 
| OLD | NEW | 
|---|