summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2015-11-30 15:13:46 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-30 23:14:45 +0000
commitcfa5b01bb1d06bf96967bd37e21a44752801948c (patch)
tree482d6cba1afc8cc6c3a8ea15749c43ec97e6f9f1 /chrome/common/chrome_paths.cc
parent3cd4753b98c9bb96618ec71ebac2c14a02182a97 (diff)
downloadchromium_src-cfa5b01bb1d06bf96967bd37e21a44752801948c.zip
chromium_src-cfa5b01bb1d06bf96967bd37e21a44752801948c.tar.gz
chromium_src-cfa5b01bb1d06bf96967bd37e21a44752801948c.tar.bz2
Reland: Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows
Changes since https://codereview.chromium.org/1416133003 are ps1 -> ps2. - Includes build fix to for debug component GN build. - Includes Crashpad roll to pull in clang compile fixes and a limit on the number of locks saved to the crash dump. - Increase timeout on tab crash telemetry test for debug builds. Original CL: Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows Crashpad is always compiled into chrome and its handler is always enabled. It only uploads in Official builds. On Windows, the crash handler is chrome.exe run with a --crashpad-handler argument. This is due to concern about incompatibilities of shipping an additional new different binary for AV, firewalls, etc. Sample renderer crash/1aed2bc785e28995 Sample browser: crash/66c822815474a5d8 See also http://crbug.com/427611 . R=mark@chromium.org TBR=cpu@chromium.org BUG=447073, 546288, 456193 Review URL: https://codereview.chromium.org/1479283002 Cr-Commit-Position: refs/heads/master@{#362258}
Diffstat (limited to 'chrome/common/chrome_paths.cc')
-rw-r--r--chrome/common/chrome_paths.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index f17ba29..66c7bf2 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -210,7 +210,7 @@ bool PathProvider(int key, base::FilePath* result) {
if (!GetDefaultUserDataDirectory(&cur))
return false;
#endif
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_WIN)
cur = cur.Append(FILE_PATH_LITERAL("Crashpad"));
#else
cur = cur.Append(FILE_PATH_LITERAL("Crash Reports"));