Allow normal users to change per session flags.

chrome/browser/ui/webui/flags_ui.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/flags_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 23 matching lines @@
                              IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE);
   source->AddLocalizedString("flagsWarningHeader", IDS_FLAGS_WARNING_HEADER);
   source->AddLocalizedString("flagsBlurb", IDS_FLAGS_WARNING_TEXT);
   source->AddLocalizedString("flagsNotSupported", IDS_FLAGS_NOT_AVAILABLE);
   source->AddLocalizedString("flagsRestartNotice", IDS_FLAGS_RELAUNCH_NOTICE);
   source->AddLocalizedString("flagsRestartButton", IDS_FLAGS_RELAUNCH_BUTTON);
   source->AddLocalizedString("resetAllButton", IDS_FLAGS_RESET_ALL_BUTTON);
   source->AddLocalizedString("disable", IDS_FLAGS_DISABLE);
   source->AddLocalizedString("enable", IDS_FLAGS_ENABLE);
 #if defined(OS_CHROMEOS)
-  // Set the strings to show which user can actually change the flags
-  source->AddLocalizedString("ownerOnly", IDS_OPTIONS_ACCOUNTS_OWNER_ONLY);
-  std::string owner;
-  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
-  source->AddString("ownerUserId", UTF8ToUTF16(owner));
+  if (!chromeos::UserManager::Get()->IsCurrentUserOwner() &&
+      base::chromeos::IsRunningOnChromeOS()) {
+    // Set the strings to show which user can actually change the flags
+    source->AddLocalizedString("ownerWarning", IDS_SYSTEM_FLAGS_OWNER_ONLY);
+    std::string owner;
+    chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+    source->AddString("ownerUserId", UTF8ToUTF16(owner));
+  } else {
+    source->AddString("ownerWarning", string16());
+    source->AddString("ownerUserId", string16());
+  }
 #endif
 
   source->SetJsonPath("strings.js");
   source->AddResourcePath("flags.js", IDR_FLAGS_JS);
-
-  int idr = IDR_FLAGS_HTML;
-#if defined (OS_CHROMEOS)
-  if (!chromeos::UserManager::Get()->IsCurrentUserOwner() &&
-      base::chromeos::IsRunningOnChromeOS())
-    idr = IDR_FLAGS_HTML_WARNING;
-#endif
-  source->SetDefaultResource(idr);
+  source->SetDefaultResource(IDR_FLAGS_HTML);
   return source;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FlagsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // The handler for Javascript messages for the about:flags page.
 class FlagsDOMHandler : public WebUIMessageHandler {
  public:
-  FlagsDOMHandler() {}
+  explicit FlagsDOMHandler(PrefService* prefs) : prefs_(prefs) {}
   virtual ~FlagsDOMHandler() {}
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
   // Callback for the "requestFlagsExperiments" message.
   void HandleRequestFlagsExperiments(const ListValue* args);
 
   // Callback for the "enableFlagsExperiment" message.
   void HandleEnableFlagsExperimentMessage(const ListValue* args);
 
   // Callback for the "restartBrowser" message. Restores all tabs on restart.
   void HandleRestartBrowser(const ListValue* args);
 
   // Callback for the "resetAllFlags" message.
   void HandleResetAllFlags(const ListValue* args);
 
  private:
+  PrefService* prefs_;
+
   DISALLOW_COPY_AND_ASSIGN(FlagsDOMHandler);
 };
 
 void FlagsDOMHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("requestFlagsExperiments",
       base::Bind(&FlagsDOMHandler::HandleRequestFlagsExperiments,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("enableFlagsExperiment",
       base::Bind(&FlagsDOMHandler::HandleEnableFlagsExperimentMessage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("restartBrowser",
       base::Bind(&FlagsDOMHandler::HandleRestartBrowser,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("resetAllFlags",
       base::Bind(&FlagsDOMHandler::HandleResetAllFlags,
                  base::Unretained(this)));
 }
 
 void FlagsDOMHandler::HandleRequestFlagsExperiments(const ListValue* args) {
   DictionaryValue results;
   results.Set("flagsExperiments",
-              about_flags::GetFlagsExperimentsData(
-                  g_browser_process->local_state()));
+              about_flags::GetFlagsExperimentsData(prefs_));
   results.SetBoolean("needsRestart",
                      about_flags::IsRestartNeededToCommitChanges());
   web_ui()->CallJavascriptFunction("returnFlagsExperiments", results);
 }
 
 void FlagsDOMHandler::HandleEnableFlagsExperimentMessage(
     const ListValue* args) {
   DCHECK_EQ(2u, args->GetSize());
   if (args->GetSize() != 2)
     return;
 
   std::string experiment_internal_name;
   std::string enable_str;
   if (!args->GetString(0, &experiment_internal_name) ||
       !args->GetString(1, &enable_str))
     return;
 
   about_flags::SetExperimentEnabled(
-      g_browser_process->local_state(),
+      prefs_,
       experiment_internal_name,
       enable_str == "true");
 }
 
 void FlagsDOMHandler::HandleRestartBrowser(const ListValue* args) {
   chrome::AttemptRestart();
 }
 
 void FlagsDOMHandler::HandleResetAllFlags(const ListValue* args) {
   about_flags::ResetAllFlags(g_browser_process->local_state());
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // FlagsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
-  web_ui->AddMessageHandler(new FlagsDOMHandler());
+  Profile* profile = Profile::FromWebUI(web_ui);
+
+#ifdef OS_CHROMEOS
+  // On Chrome OS the owner can set system wide flags and other users can only
+  // set flags for their own session.
+  if (!chromeos::UserManager::Get()->IsCurrentUserOwner()) {

[Mattias Nissler (ping if slow), 2013/02/26 16:27:35]

Do we run into issues here with racing against the ownership check? Same for
first sign-in when the owner key gets generated?

[pastarmovj, 2013/02/26 17:23:47]

On first owner sign-in maybe but for the rest of tries I think that with our
lockbox cache chances are low we'll see this problem again.

+    web_ui->AddMessageHandler(new FlagsDOMHandler(profile->GetPrefs()));
+  } else {
+    web_ui->AddMessageHandler(
+        new FlagsDOMHandler(g_browser_process->local_state()));
+  }
+#else
+  web_ui->AddMessageHandler(
+      new FlagsDOMHandler(g_browser_process->local_state()));
+#endif
 
   // Set up the about:flags source.
-  Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateFlagsUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor);
 }
 
 // static
 void FlagsUI::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kEnabledLabsExperiments);
 }
+
+// static
+void FlagsUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+  registry->RegisterListPref(prefs::kEnabledLabsExperiments,
+                             PrefRegistrySyncable::UNSYNCABLE_PREF);
+}