Add a new policy to allow for release channel delegation.

chrome/browser/ui/webui/help/help_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/help/help_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/prefs/pref_service.h"
 #endif
 
 using base::ListValue;
 
 namespace {
 
-const char kDomainChangable[] = "domain";
-
 // Returns the browser version as a string.
 string16 BuildBrowserVersionString() {
   chrome::VersionInfo version_info;
   DCHECK(version_info.is_valid());
 
   std::string browser_version = version_info.Version();
   std::string version_modifier =
       chrome::VersionInfo::GetVersionStringModifier();
   if (!version_modifier.empty())
     browser_version += " " + version_modifier;
@@ skipping 10 matching lines @@
 #if defined(OS_CHROMEOS)
 
 bool CanChangeReleaseChannel() {
   // On non managed machines we have local owner who is the only one to change
   // anything.
   if (chromeos::UserManager::Get()->IsCurrentUserOwner())
     return true;
   // On a managed machine we delegate this setting to the users of the same
   // domain only if the policy value is "domain".
   if (g_browser_process->browser_policy_connector()->IsEnterpriseManaged()) {
-    std::string value;
-    chromeos::CrosSettings::Get()->GetString(chromeos::kReleaseChannel, &value);
-    if (value != kDomainChangable)
+    bool value = false;
+    if (!chromeos::CrosSettings::Get()->GetBoolean(
+            chromeos::kReleaseChannelDelegated, &value) || !value)
       return false;
     // Get the currently logged in user and strip the domain part only.
     std::string domain = "";
     std::string user = chromeos::UserManager::Get()->GetLoggedInUser().email();
     size_t at_pos = user.find('@');
     if (at_pos != std::string::npos && at_pos + 1 < user.length())
       domain = user.substr(user.find('@') + 1);
     return domain == g_browser_process->browser_policy_connector()->
         GetEnterpriseDomain();
   }
@@ skipping 138 matching lines @@
 
 #if defined(OS_CHROMEOS)
 
 void HelpHandler::SetReleaseTrack(const ListValue* args) {
   if (!CanChangeReleaseChannel()) {
     LOG(WARNING) << "Non-owner tried to change release track.";
     return;
   }
 
   const std::string channel = UTF16ToUTF8(ExtractStringValue(args));
-  Profile* profile = Profile::FromWebUI(web_ui());
-  PrefService* prefs = profile->GetPrefs();
-  prefs->SetString("cros.system.releaseChannel", channel);
   version_updater_->SetReleaseChannel(channel);
+  // For local owner set the field in the policy blob too.

[Joao da Silva, 2012/03/09 15:15:55]

Please drop a comment explaining why IsCurrentUserOwner() called again here, as
discussed offline.

[pastarmovj, 2012/03/12 13:06:53]

Done.

+  if (chromeos::UserManager::Get()->IsCurrentUserOwner()) {
+    chromeos::CrosSettings::Get()->SetString(chromeos::kReleaseChannel,
+                                             channel);
+  }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 void HelpHandler::SetUpdateStatus(VersionUpdater::Status status,
                                   int progress, const string16& message) {
   // Only UPDATING state should have progress set.
   DCHECK(status == VersionUpdater::UPDATING || progress == 0);
 
   std::string status_str;
@@ skipping 64 matching lines @@
   web_ui()->CallJavascriptFunction("help.HelpPage.setOSFirmware",
                                    *firmware_string);
 }
 
 void HelpHandler::OnReleaseChannel(const std::string& channel) {
   scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
   web_ui()->CallJavascriptFunction(
       "help.HelpPage.updateSelectedChannel", *channel_string);
 }
 #endif // defined(OS_CHROMEOS)