| Index: chrome/common/child_process.cc
|
| ===================================================================
|
| --- chrome/common/child_process.cc (revision 55919)
|
| +++ chrome/common/child_process.cc (working copy)
|
| @@ -8,7 +8,6 @@
|
| #include <signal.h> // For SigUSR1Handler below.
|
| #endif
|
|
|
| -#include "app/l10n_util.h"
|
| #include "base/message_loop.h"
|
| #include "base/process_util.h"
|
| #include "base/string_number_conversions.h"
|
| @@ -74,28 +73,32 @@
|
|
|
| void ChildProcess::WaitForDebugger(const std::wstring& label) {
|
| #if defined(OS_WIN)
|
| - std::wstring title = l10n_util::GetString(IDS_PRODUCT_NAME);
|
| - std::wstring message = label;
|
| - message += L" starting with pid: ";
|
| - message += UTF8ToWide(base::IntToString(base::GetCurrentProcId()));
|
| - title += L" ";
|
| - title += label; // makes attaching to process easier
|
| - ::MessageBox(NULL, message.c_str(), title.c_str(),
|
| - MB_OK | MB_SETFOREGROUND);
|
| +#if defined(GOOGLE_CHROME_BUILD)
|
| + std::wstring title = L"Google Chrome";
|
| +#else // CHROMIUM_BUILD
|
| + std::wstring title = L"Chromium";
|
| +#endif // CHROMIUM_BUILD
|
| + std::wstring message = label;
|
| + message += L" starting with pid: ";
|
| + message += UTF8ToWide(base::IntToString(base::GetCurrentProcId()));
|
| + title += L" ";
|
| + title += label; // 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) << label
|
| - << " ("
|
| - << 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);
|
| + // 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) << label
|
| + << " ("
|
| + << 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();
|
| + pause();
|
| #endif // defined(OS_POSIX)
|
| }
|
|
|