chrome/browser/metrics/chrome_metrics_service_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/browser/metrics/chrome_metrics_service_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/browser/metrics/chrome_metrics_service_client.cc

diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc

index a6ee8b7ccf65cb36e888c5db99990cec75466d18..21f808799fe8cc5b4681bcf67e89bf661406ecdc 100644

--- a/chrome/browser/metrics/chrome_metrics_service_client.cc

+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc

@@ -152,7 +152,11 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefRegistrySimple* registry) {

void ChromeMetricsServiceClient::SetMetricsClientId(

const std::string& client_id) {

- crash_keys::SetCrashClientIdFromGUID(client_id);

+ crash_keys::SetMetricsClientIdFromGUID(client_id);

+void ChromeMetricsServiceClient::OnRecordingDisabled() {

+ crash_keys::ClearMetricsClientId();

}

bool ChromeMetricsServiceClient::IsOffTheRecordSessionActive() {