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

Unified Diff: chrome/browser/chromeos/policy/device_status_collector.cc

Issue 308643006: Enable enterprise device reporting features by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_status_collector.cc
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
index 5613a2a95996639dba537b1c87a90bea1e5b7c2a..1a983a4402a487c940b3c8d710d7c8c6f4994a9e 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -185,18 +185,30 @@ void DeviceStatusCollector::UpdateReportingSettings() {
weak_factory_.GetWeakPtr()))) {
return;
}
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceVersionInfo, &report_version_info_);
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceActivityTimes, &report_activity_times_);
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceBootMode, &report_boot_mode_);
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceLocation, &report_location_);
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceNetworkInterfaces, &report_network_interfaces_);
- cros_settings_->GetBoolean(
- chromeos::kReportDeviceUsers, &report_users_);
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceVersionInfo, &report_version_info_)) {
+ report_version_info_ = true;
+ }
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceActivityTimes, &report_activity_times_)) {
+ report_activity_times_ = true;
+ }
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceBootMode, &report_boot_mode_)) {
+ report_boot_mode_ = true;
+ }
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceLocation, &report_location_)) {
+ report_location_ = false;
+ }
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceNetworkInterfaces, &report_network_interfaces_)) {
+ report_network_interfaces_ = true;
+ }
+ if (!cros_settings_->GetBoolean(
+ chromeos::kReportDeviceUsers, &report_users_)) {
+ report_users_ = true;
+ }
if (report_location_) {
ScheduleGeolocationUpdateRequest();
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698