diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 12:20:27 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 12:20:27 +0000 |
| commit | 5a183bedcbdc63d8303ea329e0509f1c880d87e5 (patch) | |
| tree | d1a930234f92e88374eddb173cb8858d34718779 /chrome/browser/policy/device_policy_cache.cc | |
| parent | 9d679716ea7c58d1884f54bf49c4c68b87f101be (diff) | |
| download | chromium_src-5a183bedcbdc63d8303ea329e0509f1c880d87e5.zip chromium_src-5a183bedcbdc63d8303ea329e0509f1c880d87e5.tar.gz chromium_src-5a183bedcbdc63d8303ea329e0509f1c880d87e5.tar.bz2 | |
Connect the About page to the release channel policy.
Changes made by the local owner write through to the policy. This brings us
one step closer to have the policy be the ground truth for the update engine.
BUG=chromium-os:17240
TEST=Manual
Review URL: http://codereview.chromium.org/7388015
Patch from Patrick Dubroy <dubroy@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/device_policy_cache.cc')
| -rw-r--r-- | chrome/browser/policy/device_policy_cache.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc index a8031ae..4fa397b 100644 --- a/chrome/browser/policy/device_policy_cache.cc +++ b/chrome/browser/policy/device_policy_cache.cc @@ -346,8 +346,9 @@ void DevicePolicyCache::DecodeDevicePolicy( std::string channel = policy.release_channel().release_channel(); mandatory->Set( kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel)); - // TODO: We should probably set the release track somewhere else, but this - // policy is a work-in-progress (http://crosbug.com/15382). + // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't + // have to pass the channel in here, only ping the update engine to tell + // it to fetch the channel from the policy. chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel); } } |