Chromium Code Reviews| Index: chrome/browser/chromeos/settings/device_settings_provider.cc |
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc |
| index be2bb1e6b2aca45800199ad1932df8989a50706c..5af7f56a22dff2a62415aa1af22dd09f0548ef70 100644 |
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc |
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc |
| @@ -70,6 +70,7 @@ const char* const kKnownSettings[] = { |
| kHeartbeatEnabled, |
| kHeartbeatFrequency, |
| kLoginAuthenticationBehavior, |
| + kLoginVideoCaptureAllowedUrls, |
| kPolicyMissingMitigationMode, |
| kRebootOnShutdown, |
| kReleaseChannel, |
| @@ -270,6 +271,20 @@ void DecodeLoginPolicies( |
| kLoginAuthenticationBehavior, |
| policy.login_authentication_behavior().login_authentication_behavior()); |
| } |
| + |
| + if (policy.has_login_video_capture_allowed_urls()) { |
| + std::unique_ptr<base::ListValue> list(new base::ListValue()); |
|
bartfab (slow)
2016/05/02 10:30:29
Nit: #include <memory>
Kevin Cernekee
2016/05/02 20:02:29
Done.
|
| + const em::LoginVideoCaptureAllowedUrlsProto& |
| + login_video_capture_allowed_urls_proto = |
| + policy.login_video_capture_allowed_urls(); |
| + const RepeatedPtrField<std::string>& urls = |
| + login_video_capture_allowed_urls_proto.urls(); |
| + for (RepeatedPtrField<std::string>::const_iterator it = urls.begin(); |
|
emaxx
2016/05/02 18:42:08
Nit: Can the range-based for loop be used here?
Kevin Cernekee
2016/05/02 20:02:29
Done.
|
| + it != urls.end(); ++it) { |
| + list->Append(new base::StringValue(*it)); |
| + } |
| + new_values_cache->SetValue(kLoginVideoCaptureAllowedUrls, std::move(list)); |
|
bartfab (slow)
2016/05/02 10:30:29
Nit: #include <utility>
Kevin Cernekee
2016/05/02 20:02:29
Done.
|
| + } |
| } |
| void DecodeNetworkPolicies( |
| @@ -576,7 +591,6 @@ void DeviceSettingsProvider::DoSet(const std::string& path, |
| return; |
| } |
| } |
| - |
| } |
| void DeviceSettingsProvider::OwnershipStatusChanged() { |