Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4520)

Unified Diff: chrome/browser/chromeos/login/signed_settings.cc

Issue 7830020: Revert 99169 - 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: 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
Index: chrome/browser/chromeos/login/signed_settings.cc
===================================================================
--- chrome/browser/chromeos/login/signed_settings.cc (revision 99240)
+++ chrome/browser/chromeos/login/signed_settings.cc (working copy)
@@ -772,9 +772,12 @@
return pol.release_channel().release_channel();
} else if (prop == kStatsReportingPref) {
- if (pol.has_metrics_enabled()) {
- return kVeritas[pol.metrics_enabled().metrics_enabled()];
+ if (!pol.has_metrics_enabled() ||
+ !pol.metrics_enabled().metrics_enabled()) {
+ return kVeritas[0]; // Default to not collecting metrics.
}
+ return kVeritas[pol.metrics_enabled().metrics_enabled()];
+
}
return std::string();
}
« 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 »

Powered by Google App Engine
This is Rietveld 408576698