| Index: chrome/app/chrome_exe_main.cc
|
| ===================================================================
|
| --- chrome/app/chrome_exe_main.cc (revision 5105)
|
| +++ chrome/app/chrome_exe_main.cc (working copy)
|
| @@ -50,9 +50,6 @@
|
| // TODO(erikkay): verify client.Init() return value for official builds
|
| client.Init(L"{8A69D345-D564-463c-AFF1-A69D9E530F96}", dll_name);
|
|
|
| - // Initialize the crash reporter.
|
| - InitCrashReporter(client.GetDLLPath());
|
| -
|
| bool exit_now = false;
|
| if (ShowRestartDialogIfCrashed(&exit_now)) {
|
| // We have restarted because of a previous crash. The user might
|
| @@ -61,10 +58,15 @@
|
| return ResultCodes::NORMAL_EXIT;
|
| }
|
|
|
| - int ret = 0;
|
| - if (client.Launch(instance, &sandbox_info, command_line, show_command,
|
| - "ChromeMain", &ret)) {
|
| - return ret;
|
| + if (client.Load()) {
|
| + // Initialize the crash reporter.
|
| + InitCrashReporter(client.GetDLLPath());
|
| +
|
| + int ret = 0;
|
| + if (client.Launch(instance, &sandbox_info, command_line, show_command,
|
| + "ChromeMain", &ret)) {
|
| + return ret;
|
| + }
|
| }
|
| #else
|
| wchar_t exe_path[MAX_PATH] = {0};
|
|
|