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

Unified Diff: chrome/browser/chromeos/login/signed_settings.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: Fix indent issue. 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/chromeos/login/signed_settings.cc
diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc
index f08e81c7e7411cc6e75e131113252132138dc9de..470573ae99cd2dc032779d203d5ea9a6c043e403 100644
--- a/chrome/browser/chromeos/login/signed_settings.cc
+++ b/chrome/browser/chromeos/login/signed_settings.cc
@@ -752,6 +752,12 @@ std::string RetrievePropertyOp::LookUpInPolicy(const std::string& prop) {
return ""; // Default to invalid proxy config (will be ignored).
return serialized;
+ } else if (prop == kReleaseChannel) {
+ if (!pol.has_release_channel() ||
+ !pol.release_channel().has_release_channel())
+ return ""; // Default: don't change the release channel
+ return pol.release_channel().release_channel();
+
}
return std::string();
}

Powered by Google App Engine
This is Rietveld 408576698