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

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: 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 bb9f5339146baade3d10c68e1751dbd27db7f0dd..4b567a2e0ca2803045d422f6aaecf41a82f5adde 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/login/signed_settings_helper.h"
@@ -299,6 +301,14 @@ 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));
gfeher 2011/06/29 16:28:16 Nit: please indent four spaces. Question: do we re
Patrick Dubroy 2011/06/30 12:24:50 After discussing with Julian, I think we do want a
+ chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
+ }
}
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698