Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4413)

Unified Diff: chrome/app/chrome_exe_main.cc

Issue 10300: Implement the load chrome.dll before file version for Google Chrome builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/google_update_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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};
« no previous file with comments | « no previous file | chrome/app/google_update_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698