OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/settings/device_settings_provider.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_provider.h" |
6 | 6 |
7 #include <memory.h> | 7 #include <memory.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 kReleaseChannel, | 78 kReleaseChannel, |
79 kReleaseChannelDelegated, | 79 kReleaseChannelDelegated, |
80 kReportDeviceActivityTimes, | 80 kReportDeviceActivityTimes, |
81 kReportDeviceBootMode, | 81 kReportDeviceBootMode, |
82 kReportDeviceHardwareStatus, | 82 kReportDeviceHardwareStatus, |
83 kReportDeviceLocation, | 83 kReportDeviceLocation, |
84 kReportDeviceNetworkInterfaces, | 84 kReportDeviceNetworkInterfaces, |
85 kReportDeviceSessionStatus, | 85 kReportDeviceSessionStatus, |
86 kReportDeviceUsers, | 86 kReportDeviceUsers, |
87 kReportDeviceVersionInfo, | 87 kReportDeviceVersionInfo, |
| 88 kReportOsUpdateStatus, |
| 89 kReportRunningKioskApp, |
88 kReportUploadFrequency, | 90 kReportUploadFrequency, |
89 kServiceAccountIdentity, | 91 kServiceAccountIdentity, |
90 kSignedDataRoamingEnabled, | 92 kSignedDataRoamingEnabled, |
91 kStartUpFlags, | 93 kStartUpFlags, |
92 kStatsReportingPref, | 94 kStatsReportingPref, |
93 kSystemLogUploadEnabled, | 95 kSystemLogUploadEnabled, |
94 kSystemTimezonePolicy, | 96 kSystemTimezonePolicy, |
95 kSystemUse24HourClock, | 97 kSystemUse24HourClock, |
96 kUpdateDisabled, | 98 kUpdateDisabled, |
97 kVariationsRestrictParameter, | 99 kVariationsRestrictParameter, |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 if (reporting_policy.has_report_hardware_status()) { | 363 if (reporting_policy.has_report_hardware_status()) { |
362 new_values_cache->SetBoolean( | 364 new_values_cache->SetBoolean( |
363 kReportDeviceHardwareStatus, | 365 kReportDeviceHardwareStatus, |
364 reporting_policy.report_hardware_status()); | 366 reporting_policy.report_hardware_status()); |
365 } | 367 } |
366 if (reporting_policy.has_report_session_status()) { | 368 if (reporting_policy.has_report_session_status()) { |
367 new_values_cache->SetBoolean( | 369 new_values_cache->SetBoolean( |
368 kReportDeviceSessionStatus, | 370 kReportDeviceSessionStatus, |
369 reporting_policy.report_session_status()); | 371 reporting_policy.report_session_status()); |
370 } | 372 } |
| 373 if (reporting_policy.has_report_os_update_status()) { |
| 374 new_values_cache->SetBoolean(kReportOsUpdateStatus, |
| 375 reporting_policy.report_os_update_status()); |
| 376 } |
| 377 if (reporting_policy.has_report_running_kiosk_app()) { |
| 378 new_values_cache->SetBoolean(kReportRunningKioskApp, |
| 379 reporting_policy.report_running_kiosk_app()); |
| 380 } |
371 if (reporting_policy.has_device_status_frequency()) { | 381 if (reporting_policy.has_device_status_frequency()) { |
372 new_values_cache->SetInteger( | 382 new_values_cache->SetInteger( |
373 kReportUploadFrequency, | 383 kReportUploadFrequency, |
374 reporting_policy.device_status_frequency()); | 384 reporting_policy.device_status_frequency()); |
375 } | 385 } |
376 } | 386 } |
377 } | 387 } |
378 | 388 |
379 void DecodeHeartbeatPolicies( | 389 void DecodeHeartbeatPolicies( |
380 const em::ChromeDeviceSettingsProto& policy, | 390 const em::ChromeDeviceSettingsProto& policy, |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 // Notify the observers we are done. | 847 // Notify the observers we are done. |
838 std::vector<base::Closure> callbacks; | 848 std::vector<base::Closure> callbacks; |
839 callbacks.swap(callbacks_); | 849 callbacks.swap(callbacks_); |
840 for (size_t i = 0; i < callbacks.size(); ++i) | 850 for (size_t i = 0; i < callbacks.size(); ++i) |
841 callbacks[i].Run(); | 851 callbacks[i].Run(); |
842 | 852 |
843 return settings_loaded; | 853 return settings_loaded; |
844 } | 854 } |
845 | 855 |
846 } // namespace chromeos | 856 } // namespace chromeos |
OLD | NEW |