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/device_settings_provider.h" | 5 #include "chrome/browser/chromeos/device_settings_provider.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
424 it != whitelist.end(); ++it) { | 424 it != whitelist.end(); ++it) { |
425 list->Append(base::Value::CreateStringValue(*it)); | 425 list->Append(base::Value::CreateStringValue(*it)); |
426 } | 426 } |
427 new_values_cache.SetValue(kAccountsPrefUsers, list); | 427 new_values_cache.SetValue(kAccountsPrefUsers, list); |
428 | 428 |
429 if (pol.has_device_reporting()) { | 429 if (pol.has_device_reporting()) { |
430 if (pol.device_reporting().has_report_version_info()) { | 430 if (pol.device_reporting().has_report_version_info()) { |
431 new_values_cache.SetBoolean(kReportDeviceVersionInfo, | 431 new_values_cache.SetBoolean(kReportDeviceVersionInfo, |
432 pol.device_reporting().report_version_info()); | 432 pol.device_reporting().report_version_info()); |
433 } | 433 } |
434 if (pol.device_reporting().has_report_activity_times()) { | 434 // TODO(dubroy): Re-add device activity time policy here when the UI |
435 new_values_cache.SetBoolean(kReportDeviceActivityTimes, | 435 // to notify the user has been implemented (http://crosbug.com/26252). |
Mattias Nissler (ping if slow)
2012/02/15 14:56:21
Umm... I guess you want to change this :)
Patrick Dubroy
2012/02/15 15:37:25
N/A.
| |
436 pol.device_reporting().report_activity_times()); | |
437 } | |
438 if (pol.device_reporting().has_report_boot_mode()) { | 436 if (pol.device_reporting().has_report_boot_mode()) { |
439 new_values_cache.SetBoolean(kReportDeviceBootMode, | 437 new_values_cache.SetBoolean(kReportDeviceBootMode, |
440 pol.device_reporting().report_boot_mode()); | 438 pol.device_reporting().report_boot_mode()); |
441 } | 439 } |
442 } | 440 } |
443 | 441 |
444 // Collect all notifications but send them only after we have swapped the | 442 // Collect all notifications but send them only after we have swapped the |
445 // cache so that if somebody actually reads the cache will be already valid. | 443 // cache so that if somebody actually reads the cache will be already valid. |
446 std::vector<std::string> notifications; | 444 std::vector<std::string> notifications; |
447 // Go through the new values and verify in the old ones. | 445 // Go through the new values and verify in the old ones. |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
645 Reload(); | 643 Reload(); |
646 return; | 644 return; |
647 } | 645 } |
648 LOG(ERROR) << "No retries left"; | 646 LOG(ERROR) << "No retries left"; |
649 break; | 647 break; |
650 } | 648 } |
651 } | 649 } |
652 } | 650 } |
653 | 651 |
654 } // namespace chromeos | 652 } // namespace chromeos |
OLD | NEW |