Chromium Code Reviews| Index: chrome/browser/about_flags.h |
| diff --git a/chrome/browser/about_flags.h b/chrome/browser/about_flags.h |
| index 2225d3d4a58faf40462a560c77f691899a09f444..0dba523ba38592dc74ee2345d744e09646fe4ed6 100644 |
| --- a/chrome/browser/about_flags.h |
| +++ b/chrome/browser/about_flags.h |
| @@ -22,7 +22,13 @@ 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). |
| @@ -108,7 +114,7 @@ struct Experiment { |
| void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
|
Nico
2013/04/16 21:40:24
nit: I'd move the enum right above this function,
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(); |