Add differentiation between owner only and common flags on ChromeOS.

chrome/browser/about_flags.h

 // 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.
 
 #ifndef CHROME_BROWSER_ABOUT_FLAGS_H_
 #define CHROME_BROWSER_ABOUT_FLAGS_H_
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/string16.h"
 
 class PrefService;
 
 namespace base {
 class ListValue;
 }
 
 namespace about_flags {
 
 // Enumeration of OSs.
 // This is exposed only for testing.
 enum { kOsMac = 1 << 0, kOsWin = 1 << 1, kOsLinux = 1 << 2 , kOsCrOS = 1 << 3,
-       kOsAndroid = 1 << 4 };
+       kOsAndroid = 1 << 4, kOsCrOSOwnerOnly = 1 << 5 };
+
+// Differentiate between generic flags available on a per session base and flags
+// that influence the whole machine and can be said by the admin only. This flag
+// is relevant for ChromeOS for now only and dictates whether entries marked
+// with the |kOsCrOSOwnerOnly| label should be enabled in the UI or not.
+enum FlagAccess { kGeneralAccessFlagsOnly, kOwnerAccessToFlags };
 
 // Experiment is used internally by about_flags to describe an experiment (and
 // for testing).
 // This is exposed only for testing.
 struct Experiment {
   enum Type {
     // An experiment with a single value. This is typically what you want.
     SINGLE_VALUE,
 
     // The experiment has multiple values only one of which is ever enabled.
@@ skipping 63 matching lines @@
   // Returns the name used in prefs for the choice at the specified |index|.
   std::string NameForChoice(int index) const;
 
   // Returns the human readable description for the choice at |index|.
   string16 DescriptionForChoice(int index) const;
 };
 
 // Reads the Labs |prefs| (called "Labs" for historical reasons) and adds the
 // commandline flags belonging to the active experiments to |command_line|.
 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
 

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

nit: I'd move the enum right above this function, as that's where it's used.

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

Done.

 // Get a list of all available experiments. The caller owns the result.
-base::ListValue* GetFlagsExperimentsData(PrefService* prefs);
+base::ListValue* GetFlagsExperimentsData(PrefService* prefs, FlagAccess access);
 
 // Returns true if one of the experiment flags has been flipped since startup.
 bool IsRestartNeededToCommitChanges();
 
 // Enables or disables the experiment with id |internal_name|.
 void SetExperimentEnabled(
     PrefService* prefs, const std::string& internal_name, bool enable);
 
 // Removes all switches that were added to a command line by a previous call to
 // |ConvertFlagsToSwitches()|.
@@ skipping 26 matching lines @@
 
 // Separator used for multi values. Multi values are represented in prefs as
 // name-of-experiment + kMultiSeparator + selected_index.
 extern const char kMultiSeparator[];
 
 }  // namespace testing
 
 }  // namespace about_flags
 
 #endif  // CHROME_BROWSER_ABOUT_FLAGS_H_