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

Unified Diff: chrome/common/chrome_paths.cc

Issue 1023783005: Merge Crashpad to the 42.0.2311 branch (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2311
Patch Set: Created 5 years, 9 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
« no previous file with comments | « chrome/common/child_process_logging_win.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index e4a0865f26a33faaf123dbae43df30ba2f162112..7787cab375f85429c30650c40d234daa754374a8 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -204,7 +204,11 @@ bool PathProvider(int key, base::FilePath* result) {
if (!GetDefaultUserDataDirectory(&cur))
return false;
#endif
+#if defined(OS_MACOSX)
+ cur = cur.Append(FILE_PATH_LITERAL("Crashpad"));
+#else
cur = cur.Append(FILE_PATH_LITERAL("Crash Reports"));
+#endif
create_dir = true;
break;
#if defined(OS_WIN)
« no previous file with comments | « chrome/common/child_process_logging_win.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698