chrome/browser/metrics/chrome_metrics_service_client.cc - Issue 2014463003: Modifications for recording whether UMA/Crash default state for iOS

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 2014463003: Modifications for recording whether UMA/Crash default state for iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android include Created 4 years, 7 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/browser/first_run/first_run_internal_posix.cc ('k') | chrome/browser/metrics/metrics_reporting_state.h » ('j') | components/metrics/metrics_reporting_default_state.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 963047acbe13f6d6dc62b7321a0b6edad7e64dd3..bb4518ab49264cf71e36656e9fbea94237d9309a 100644

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

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

@@ -43,6 +43,7 @@

#include "components/metrics/file_metrics_provider.h"

#include "components/metrics/gpu/gpu_metrics_provider.h"

#include "components/metrics/metrics_pref_names.h"

+#include "components/metrics/metrics_reporting_default_state.h"

#include "components/metrics/metrics_service.h"

#include "components/metrics/metrics_service_client.h"

#include "components/metrics/metrics_state_manager.h"

@@ -250,7 +251,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefRegistrySimple* registry) {

RegisterInstallerFileMetricsPreferences(registry);

- RegisterMetricsReportingStatePrefs(registry);

+ metrics::RegisterMetricsReportingStatePrefs(registry);

#if BUILDFLAG(ANDROID_JAVA_UI)

AndroidMetricsProvider::RegisterPrefs(registry);

@@ -376,7 +377,8 @@ bool ChromeMetricsServiceClient::IsReportingPolicyManaged() {

metrics::MetricsServiceClient::EnableMetricsDefault

ChromeMetricsServiceClient::GetDefaultOptIn() {

- return GetMetricsReportingDefaultOptIn(g_browser_process->local_state());

+ return metrics::GetMetricsReportingDefaultOptIn(

+ g_browser_process->local_state());

}

void ChromeMetricsServiceClient::Initialize() {