| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/message_loop.h" | 5 #include "base/message_loop.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/common/child_process.h" | 7 #include "chrome/common/child_process.h" |
| 8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
| 9 #include "chrome/common/main_function_params.h" | 9 #include "chrome/common/main_function_params.h" |
| 10 #include "chrome/ppapi_plugin/ppapi_thread.h" | 10 #include "chrome/ppapi_plugin/ppapi_thread.h" |
| 11 | 11 |
| 12 // Main function for starting the PPAPI plugin process. | 12 // Main function for starting the PPAPI plugin process. |
| 13 int PpapiPluginMain(const MainFunctionParams& parameters) { | 13 int PpapiPluginMain(const MainFunctionParams& parameters) { |
| 14 #if defined(OS_LINUX) | |
| 15 // On Linux we exec ourselves from /proc/self/exe, but that makes the | |
| 16 // process name that shows up in "ps" etc. for this process show as | |
| 17 // "exe" instead of "chrome" or something reasonable. Try to fix it. | |
| 18 CommandLine::SetProcTitle(); | |
| 19 #endif | |
| 20 | |
| 21 const CommandLine& command_line = parameters.command_line_; | 14 const CommandLine& command_line = parameters.command_line_; |
| 22 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { | 15 if (command_line.HasSwitch(switches::kPpapiStartupDialog)) { |
| 23 ChildProcess::WaitForDebugger(L"Ppapi"); | 16 ChildProcess::WaitForDebugger(L"Ppapi"); |
| 24 } | 17 } |
| 25 | 18 |
| 26 MessageLoop main_message_loop(MessageLoop::TYPE_UI); | 19 MessageLoop main_message_loop(MessageLoop::TYPE_UI); |
| 27 PlatformThread::SetName("CrPPAPIMain"); | 20 PlatformThread::SetName("CrPPAPIMain"); |
| 28 | 21 |
| 29 ChildProcess ppapi_process; | 22 ChildProcess ppapi_process; |
| 30 ppapi_process.set_main_thread(new PpapiThread()); | 23 ppapi_process.set_main_thread(new PpapiThread()); |
| 31 | 24 |
| 32 main_message_loop.Run(); | 25 main_message_loop.Run(); |
| 33 return 0; | 26 return 0; |
| 34 } | 27 } |
| OLD | NEW |