Add differentiation between owner only and common flags on ChromeOS.

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"
@@ skipping 70 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FlagsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // The handler for Javascript messages for the about:flags page.
 class FlagsDOMHandler : public WebUIMessageHandler {
  public:
-  explicit FlagsDOMHandler(PrefService* prefs) : prefs_(prefs) {}
+  explicit FlagsDOMHandler(PrefService* prefs, bool owner)
+      : prefs_(prefs), owner_(owner) {}
   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_;
+  bool owner_;

[Nico, 2013/04/16 21:40:24]

Use your new enum for this too, instead of having a bool.

[pastarmovj, 2013/04/17 16:03:22]

Done.

 
   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;
+  about_flags::FlagAccess access =
+      owner_ ? about_flags::kOwnerAccessToFlags :
+               about_flags::kGeneralAccessFlagsOnly;
   results.Set("flagsExperiments",
-              about_flags::GetFlagsExperimentsData(prefs_));
+              about_flags::GetFlagsExperimentsData(prefs_, access));
   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;
@@ skipping 30 matching lines @@
     : WebUIController(web_ui),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   Profile* profile = Profile::FromWebUI(web_ui);
 
 #if defined(OS_CHROMEOS)
   chromeos::DeviceSettingsService::Get()->GetOwnershipStatusAsync(
       base::Bind(&FlagsUI::FinishInitialization,
                  weak_factory_.GetWeakPtr(), profile));
 #else
   web_ui->AddMessageHandler(
-      new FlagsDOMHandler(g_browser_process->local_state()));
+      new FlagsDOMHandler(g_browser_process->local_state(), true));
 
   // Set up the about:flags source.
   content::WebUIDataSource::Add(profile, CreateFlagsUIHTMLSource());
 #endif
 }
 
 FlagsUI::~FlagsUI() {
 }
 
 // static
@@ skipping 15 matching lines @@
                              PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void FlagsUI::FinishInitialization(
     Profile* profile,
     chromeos::DeviceSettingsService::OwnershipStatus status,
     bool current_user_is_owner) {
   // On Chrome OS the owner can set system wide flags and other users can only
   // set flags for their own session.
   if (!current_user_is_owner) {
-    web_ui()->AddMessageHandler(new FlagsDOMHandler(profile->GetPrefs()));
+    web_ui()->AddMessageHandler(
+        new FlagsDOMHandler(profile->GetPrefs(), false));
   } else {
     web_ui()->AddMessageHandler(
-        new FlagsDOMHandler(g_browser_process->local_state()));
+        new FlagsDOMHandler(g_browser_process->local_state(), true));
     // If the owner managed to set the flags pref on his own profile clear it
     // because it will never be accessible anymore.
     if (profile->GetPrefs()->HasPrefPath(prefs::kEnabledLabsExperiments))
       profile->GetPrefs()->ClearPref(prefs::kEnabledLabsExperiments);
   }
 
   // Set up the about:flags source.
   content::WebUIDataSource::Add(profile, CreateFlagsUIHTMLSource());
 }
 #endif