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

Unified Diff: components/crash/content/app/crashpad_win.cc

Issue 2478633002: Update Crashpad to b47bf6c250c6b825dee1c5fbad9152c2c962e828 (Closed)
Patch Set: mac comment 2 Created 4 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 | « components/crash/content/app/crashpad_mac.mm ('k') | third_party/crashpad/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/crash/content/app/crashpad_win.cc
diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc
index d9a408973a259bb5a46404ab6cc7970b4dcb7456..a22af313a622b6332a8630b09e9ff74d97ed2d1d 100644
--- a/components/crash/content/app/crashpad_win.cc
+++ b/components/crash/content/app/crashpad_win.cc
@@ -58,7 +58,6 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
bool embedded_handler) {
base::FilePath database_path; // Only valid in the browser process.
base::FilePath metrics_path; // Only valid in the browser process.
- bool result = false;
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
const char kServerUrlVar[] = "CHROME_CRASHPAD_SERVER_URL";
@@ -119,9 +118,9 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
exe_file = exe_dir.Append(FILE_PATH_LITERAL("crashpad_handler.exe"));
}
- result = g_crashpad_client.Get().StartHandler(
+ g_crashpad_client.Get().StartHandler(
exe_file, database_path, metrics_path, url, process_annotations,
- arguments, false);
+ arguments, false, false);
// If we're the browser, push the pipe name into the environment so child
// processes can connect to it. If we inherited another crashpad_handler's
@@ -130,16 +129,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
base::UTF16ToUTF8(g_crashpad_client.Get().GetHandlerIPCPipe()));
} else {
std::string pipe_name_utf8;
- result = env->GetVar(kPipeNameVar, &pipe_name_utf8);
- if (result) {
- result = g_crashpad_client.Get().SetHandlerIPCPipe(
+ if (env->GetVar(kPipeNameVar, &pipe_name_utf8)) {
+ g_crashpad_client.Get().SetHandlerIPCPipe(
base::UTF8ToUTF16(pipe_name_utf8));
}
}
- if (result) {
- result = g_crashpad_client.Get().UseHandler();
- }
return database_path;
}
« no previous file with comments | « components/crash/content/app/crashpad_mac.mm ('k') | third_party/crashpad/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698