chrome/browser/crash_upload_list.cc - Issue 1023783005: Merge Crashpad to the 42.0.2311 branch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/crash_upload_list.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:

Index: chrome/browser/crash_upload_list.cc

diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc

index 911fec466b5d6f84ae3c40941b3958319385a935..f1203542a51e6a9354f0c0a6cb78028088781e18 100644

--- a/chrome/browser/crash_upload_list.cc

+++ b/chrome/browser/crash_upload_list.cc

@@ -9,6 +9,8 @@

#include "chrome/common/chrome_paths.h"

#if defined(OS_WIN)

#include "chrome/browser/crash_upload_list_win.h"

+#elif defined(OS_MACOSX)

+#include "chrome/browser/crash_upload_list_mac.h"

#endif

// static

@@ -22,6 +24,8 @@ CrashUploadList* CrashUploadList::Create(Delegate* delegate) {

crash_dir_path.AppendASCII(kReporterLogFilename);

#if defined(OS_WIN)

return new CrashUploadListWin(delegate, upload_log_path);

+#elif defined(OS_MACOSX)

+ return new CrashUploadListMac(delegate, upload_log_path);

#else

return new CrashUploadList(delegate, upload_log_path);

#endif