Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: chrome/browser/policy/device_policy_cache.cc

Issue 7287001: Add a device policy for specifying the release channel. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change inconsistent wording in policy template. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/device_policy_cache.cc
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc
index de6894034aff2f0dadfeccda9aef1f49c528017c..f972779342d4f73d8e8c90b75954915fd4137945 100644
--- a/chrome/browser/policy/device_policy_cache.cc
+++ b/chrome/browser/policy/device_policy_cache.cc
@@ -9,6 +9,8 @@
#include "base/logging.h"
#include "base/task.h"
#include "base/values.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/update_library.h"
#include "chrome/browser/chromeos/cros_settings_names.h"
#include "chrome/browser/chromeos/login/ownership_service.h"
#include "chrome/browser/chromeos/user_cros_settings_provider.h"
@@ -302,6 +304,16 @@ void DevicePolicyCache::DecodeDevicePolicy(
Value::CreateStringValue(container.proxy_bypass_list()));
}
}
+
+ if (policy.has_release_channel() &&
+ policy.release_channel().has_release_channel()) {
+ 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).
+ chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
+ }
}
} // namespace policy
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/proto/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698