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

Unified Diff: chrome/app/chrome_exe_main_win.cc

Issue 2867063002: Stability instrumentation Crashpad integration (Closed)
Patch Set: Siggi round 3 Created 3 years, 7 months 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
Index: chrome/app/chrome_exe_main_win.cc
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index b1095fb081dd470f78f63f2e814c0b02e0953a15..18f1abdcd0ac8c420320cebc91c703b492f59cfe 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -30,6 +30,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/install_static/initialize_from_primary_module.h"
#include "chrome/install_static/install_util.h"
+#include "chrome/install_static/user_data_dir.h"
#include "chrome_elf/chrome_elf_main.h"
#include "components/crash/content/app/crash_switches.h"
#include "components/crash/content/app/crashpad.h"
@@ -244,8 +245,12 @@ int main() {
if (process_type == crash_reporter::switches::kCrashpadHandler) {
crash_reporter::SetupFallbackCrashHandling(*command_line);
+ base::string16 user_data_dir;
+ if (!install_static::GetUserDataDirectory(&user_data_dir, nullptr))
+ user_data_dir.clear();
return crash_reporter::RunAsCrashpadHandler(
- *base::CommandLine::ForCurrentProcess(), switches::kProcessType);
+ *base::CommandLine::ForCurrentProcess(), user_data_dir,
+ switches::kProcessType, switches::kUserDataDir);
} else if (process_type == crash_reporter::switches::kFallbackCrashHandler) {
return RunFallbackCrashHandler(*command_line);
}

Powered by Google App Engine
This is Rietveld 408576698