diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 01:43:56 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 01:43:56 +0000 |
commit | cd60f084650684bb407f237bde2f7156b9f75aca (patch) | |
tree | 8dfe29aeefde03908ff1ab894ea220ed89812b4b /chrome/renderer/renderer_main.cc | |
parent | 2858d5406a254a1dba769b112ca86951f0ec9361 (diff) | |
download | chromium_src-cd60f084650684bb407f237bde2f7156b9f75aca.zip chromium_src-cd60f084650684bb407f237bde2f7156b9f75aca.tar.gz chromium_src-cd60f084650684bb407f237bde2f7156b9f75aca.tar.bz2 |
Added support for --worker-startup-dialog command line flag.
Added ChildProcess::WaitForDebugger() utility routine, and changed the various
processes to use it.
Review URL: http://codereview.chromium.org/370006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main.cc')
-rw-r--r-- | chrome/renderer/renderer_main.cc | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 14a9d81..1531c40 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -24,7 +24,6 @@ #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_thread.h" -#include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_module.h" @@ -32,12 +31,6 @@ #include "chrome/app/breakpad_linux.h" #endif -#if defined(OS_POSIX) -#include <signal.h> - -static void SigUSR1Handler(int signal) { } -#endif - // This function provides some ways to test crash and assertion handling // behavior of the renderer. static void HandleRendererErrorTestParameters(const CommandLine& command_line) { @@ -53,28 +46,7 @@ static void HandleRendererErrorTestParameters(const CommandLine& command_line) { } if (command_line.HasSwitch(switches::kRendererStartupDialog)) { -#if defined(OS_WIN) - std::wstring title = l10n_util::GetString(IDS_PRODUCT_NAME); - std::wstring message = L"renderer starting with pid: "; - message += IntToWString(base::GetCurrentProcId()); - title += L" renderer"; // makes attaching to process easier - ::MessageBox(NULL, message.c_str(), title.c_str(), - MB_OK | MB_SETFOREGROUND); -#elif defined(OS_POSIX) - // TODO(playmobil): In the long term, overriding this flag doesn't seem - // right, either use our own flag or open a dialog we can use. - // This is just to ease debugging in the interim. - LOG(WARNING) << "Renderer (" - << getpid() - << ") paused waiting for debugger to attach @ pid"; - // Install a signal handler so that pause can be woken. - struct sigaction sa; - memset(&sa, 0, sizeof(sa)); - sa.sa_handler = SigUSR1Handler; - sigaction(SIGUSR1, &sa, NULL); - - pause(); -#endif // defined(OS_POSIX) + ChildProcess::WaitForDebugger(L"Renderer"); } } |