chrome/browser/chromeos/login/signed_settings.cc - Issue 7741045: Delay the metrics policy migration call to make sure ownership has been taken.

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/chromeos/login/signed_settings.cc

Issue 7741045: Delay the metrics policy migration call to make sure ownership has been taken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed nits. Created 9 years, 4 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/chromeos/login/ownership_status_checker.cc ('k') | chrome/browser/chromeos/user_cros_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signed_settings.cc

diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc

index 9bc98b8e6294b5a880c739dd23c294a2db14d5e9..3e25a9c79e21e1b617f996e303147ff7da27f235 100644

--- a/chrome/browser/chromeos/login/signed_settings.cc

+++ b/chrome/browser/chromeos/login/signed_settings.cc

@@ -772,12 +772,9 @@ std::string RetrievePropertyOp::LookUpInPolicy(const std::string& prop) {

return pol.release_channel().release_channel();

} else if (prop == kStatsReportingPref) {

- if (!pol.has_metrics_enabled() ||

- !pol.metrics_enabled().metrics_enabled()) {

- return kVeritas[0]; // Default to not collecting metrics.

+ if (pol.has_metrics_enabled()) {

+ return kVeritas[pol.metrics_enabled().metrics_enabled()];

}

- return kVeritas[pol.metrics_enabled().metrics_enabled()];

}

return std::string();

}