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/login/signed_settings_helper.h" | 16 #include "chrome/browser/chromeos/login/signed_settings_helper.h" |
15 #include "chrome/browser/chromeos/user_cros_settings_provider.h" | 17 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
16 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 18 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
17 #include "chrome/browser/policy/device_policy_identity_strategy.h" | 19 #include "chrome/browser/policy/device_policy_identity_strategy.h" |
18 #include "chrome/browser/policy/enterprise_install_attributes.h" | 20 #include "chrome/browser/policy/enterprise_install_attributes.h" |
19 #include "chrome/browser/policy/policy_map.h" | 21 #include "chrome/browser/policy/policy_map.h" |
20 #include "chrome/browser/policy/proto/device_management_backend.pb.h" | 22 #include "chrome/browser/policy/proto/device_management_backend.pb.h" |
21 #include "chrome/browser/policy/proto/device_management_constants.h" | 23 #include "chrome/browser/policy/proto/device_management_constants.h" |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
292 } | 294 } |
293 if (container.has_proxy_pac_url()) { | 295 if (container.has_proxy_pac_url()) { |
294 recommended->Set(kPolicyProxyPacUrl, | 296 recommended->Set(kPolicyProxyPacUrl, |
295 Value::CreateStringValue(container.proxy_pac_url())); | 297 Value::CreateStringValue(container.proxy_pac_url())); |
296 } | 298 } |
297 if (container.has_proxy_bypass_list()) { | 299 if (container.has_proxy_bypass_list()) { |
298 recommended->Set(kPolicyProxyBypassList, | 300 recommended->Set(kPolicyProxyBypassList, |
299 Value::CreateStringValue(container.proxy_bypass_list())); | 301 Value::CreateStringValue(container.proxy_bypass_list())); |
300 } | 302 } |
301 } | 303 } |
304 | |
305 if (policy.has_release_channel() && | |
306 policy.release_channel().has_release_channel()) { | |
307 std::string channel = policy.release_channel().release_channel(); | |
308 mandatory->Set( | |
309 kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel)); | |
gfeher
2011/06/30 12:49:28
FYI: this action will trigger NOTIMPLEMENTED() at
Patrick Dubroy
2011/06/30 14:28:39
Ok, I'll do that in a follow up CL.
| |
310 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel); | |
311 } | |
302 } | 312 } |
303 | 313 |
304 } // namespace policy | 314 } // namespace policy |
OLD | NEW |