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/policy/device_policy_decoder_chromeos.h" | 5 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 std::string channel(container.release_channel()); | 392 std::string channel(container.release_channel()); |
393 policies->Set(key::kChromeOsReleaseChannel, | 393 policies->Set(key::kChromeOsReleaseChannel, |
394 POLICY_LEVEL_MANDATORY, | 394 POLICY_LEVEL_MANDATORY, |
395 POLICY_SCOPE_MACHINE, | 395 POLICY_SCOPE_MACHINE, |
396 Value::CreateStringValue(channel), | 396 Value::CreateStringValue(channel), |
397 NULL); | 397 NULL); |
398 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't | 398 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't |
399 // have to pass the channel in here, only ping the update engine to tell | 399 // have to pass the channel in here, only ping the update engine to tell |
400 // it to fetch the channel from the policy. | 400 // it to fetch the channel from the policy. |
401 chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()-> | 401 chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()-> |
402 SetReleaseTrack(channel); | 402 SetChannel(channel, false); |
403 } | 403 } |
404 if (container.has_release_channel_delegated()) { | 404 if (container.has_release_channel_delegated()) { |
405 policies->Set(key::kChromeOsReleaseChannelDelegated, | 405 policies->Set(key::kChromeOsReleaseChannelDelegated, |
406 POLICY_LEVEL_MANDATORY, | 406 POLICY_LEVEL_MANDATORY, |
407 POLICY_SCOPE_MACHINE, | 407 POLICY_SCOPE_MACHINE, |
408 Value::CreateBooleanValue( | 408 Value::CreateBooleanValue( |
409 container.release_channel_delegated()), | 409 container.release_channel_delegated()), |
410 NULL); | 410 NULL); |
411 } | 411 } |
412 } | 412 } |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 DecodeLoginPolicies(policy, policies); | 654 DecodeLoginPolicies(policy, policies); |
655 DecodeKioskPolicies(policy, policies, install_attributes); | 655 DecodeKioskPolicies(policy, policies, install_attributes); |
656 DecodeNetworkPolicies(policy, policies, install_attributes); | 656 DecodeNetworkPolicies(policy, policies, install_attributes); |
657 DecodeReportingPolicies(policy, policies); | 657 DecodeReportingPolicies(policy, policies); |
658 DecodeAutoUpdatePolicies(policy, policies); | 658 DecodeAutoUpdatePolicies(policy, policies); |
659 DecodeAccessibilityPolicies(policy, policies); | 659 DecodeAccessibilityPolicies(policy, policies); |
660 DecodeGenericPolicies(policy, policies); | 660 DecodeGenericPolicies(policy, policies); |
661 } | 661 } |
662 | 662 |
663 } // namespace policy | 663 } // namespace policy |
OLD | NEW |