chrome/app/chrome_crash_reporter_client.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/app/chrome_crash_reporter_client.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/app/chrome_crash_reporter_client.cc

diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc

index 25769f6cba1c476d807fcfad9a4b638df5a021e7..ff1b2bbd9c26907d3e7d14220d98aee9828d753b 100644

--- a/chrome/app/chrome_crash_reporter_client.cc

+++ b/chrome/app/chrome_crash_reporter_client.cc

@@ -80,10 +80,12 @@ ChromeCrashReporterClient::ChromeCrashReporterClient() {}

ChromeCrashReporterClient::~ChromeCrashReporterClient() {}

+#if !defined(OS_MACOSX)

void ChromeCrashReporterClient::SetCrashReporterClientIdFromGUID(

const std::string& client_guid) {

- crash_keys::SetCrashClientIdFromGUID(client_guid);

+ crash_keys::SetMetricsClientIdFromGUID(client_guid);

}

+#endif

#if defined(OS_WIN)

bool ChromeCrashReporterClient::GetAlternativeCrashDumpLocation(