| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/policy/device_policy_cache.h" | 5 #include "chrome/browser/policy/device_policy_cache.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/task.h" | 10 #include "base/task.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 13 #include "chrome/browser/chromeos/cros/update_library.h" |
| 12 #include "chrome/browser/chromeos/cros_settings_names.h" | 14 #include "chrome/browser/chromeos/cros_settings_names.h" |
| 13 #include "chrome/browser/chromeos/login/ownership_service.h" | 15 #include "chrome/browser/chromeos/login/ownership_service.h" |
| 14 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 16 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
| 15 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 17 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 16 #include "chrome/browser/policy/device_policy_identity_strategy.h" | 18 #include "chrome/browser/policy/device_policy_identity_strategy.h" |
| 17 #include "chrome/browser/policy/enterprise_install_attributes.h" | 19 #include "chrome/browser/policy/enterprise_install_attributes.h" |
| 18 #include "chrome/browser/policy/policy_map.h" | 20 #include "chrome/browser/policy/policy_map.h" |
| 19 #include "chrome/browser/policy/proto/device_management_backend.pb.h" | 21 #include "chrome/browser/policy/proto/device_management_backend.pb.h" |
| 20 #include "chrome/browser/policy/proto/device_management_constants.h" | 22 #include "chrome/browser/policy/proto/device_management_constants.h" |
| 21 #include "chrome/browser/policy/proto/device_management_local.pb.h" | 23 #include "chrome/browser/policy/proto/device_management_local.pb.h" |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 } | 297 } |
| 296 if (container.has_proxy_pac_url()) { | 298 if (container.has_proxy_pac_url()) { |
| 297 recommended->Set(kPolicyProxyPacUrl, | 299 recommended->Set(kPolicyProxyPacUrl, |
| 298 Value::CreateStringValue(container.proxy_pac_url())); | 300 Value::CreateStringValue(container.proxy_pac_url())); |
| 299 } | 301 } |
| 300 if (container.has_proxy_bypass_list()) { | 302 if (container.has_proxy_bypass_list()) { |
| 301 recommended->Set(kPolicyProxyBypassList, | 303 recommended->Set(kPolicyProxyBypassList, |
| 302 Value::CreateStringValue(container.proxy_bypass_list())); | 304 Value::CreateStringValue(container.proxy_bypass_list())); |
| 303 } | 305 } |
| 304 } | 306 } |
| 307 |
| 308 if (policy.has_release_channel() && |
| 309 policy.release_channel().has_release_channel()) { |
| 310 std::string channel = policy.release_channel().release_channel(); |
| 311 mandatory->Set( |
| 312 kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel)); |
| 313 // TODO: We should probably set the release track somewhere else, but this |
| 314 // policy is a work-in-progress (http://crosbug.com/15382). |
| 315 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel); |
| 316 } |
| 305 } | 317 } |
| 306 | 318 |
| 307 } // namespace policy | 319 } // namespace policy |
| OLD | NEW |