Show all experiments, even those that are unavailable on the current platform

chrome/browser/about_flags.cc

 // Copyright (c) 2011 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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 24 matching lines @@
     Experiment::SINGLE_VALUE, command_line_switch, switch_value, NULL, 0
 #define SINGLE_VALUE_TYPE(command_line_switch) \
     SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, "")
 #define MULTI_VALUE_TYPE(choices) \
     Experiment::MULTI_VALUE, "", "", choices, arraysize(choices)
 
 namespace {
 
 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS;
 
+void AddOsStrings(unsigned bitmask, ListValue* list) {

[Nico, 2011/12/17 03:34:27]

Needs a very short comment above it describing what it does

[Tyler Breisacher (Chromium), 2011/12/17 04:20:34]

Done. Although writing the comment is making me think it might be clearer if
this function takes the Experiment, rather than the bitmask. What do you think?

[Nico, 2011/12/17 05:14:20]

It's fine either way I think

+  struct {
+    unsigned bit;
+    const char str[10];

[Tyler Breisacher (Chromium), 2011/12/17 03:29:01]

This "10" is super ugly. Without it, I get a compiler error: "initializer-string
for array of chars is too long". There has to be a less hacky way to fix that,
right?

[Nico, 2011/12/17 03:34:27]

const char* const str

Also, "name" is probably better than "str", I was in pseudo-code-typing mode

[Tyler Breisacher (Chromium), 2011/12/17 04:20:34]

Done.

+  } kBitsToOs[] = {
+    {kOsMac, "Mac"},
+    {kOsWin, "Windows"},
+    {kOsLinux, "Linux"},
+    {kOsCrOS, "Chrome OS"},
+  };
+  for (unsigned i = 0; i < ARRAYSIZE_UNSAFE(kBitsToOs); ++i)

[Nico, 2011/12/17 03:34:27]

does "int" not work?

[Tyler Breisacher (Chromium), 2011/12/17 04:20:34]

chrome/browser/about_flags.cc:59: error: comparison between signed and unsigned
integer expressions

Although, the ARRAYSIZE_UNSAFE documentation says it returns a |size_t| not an
|unsigned| so it's probably better to declare it as size_t.

+    if (bitmask & kBitsToOs[i].bit)
+      list->Append(new StringValue(kBitsToOs[i].str));
+}
+
 // Names for former Chrome OS Labs experiments, shared with prefs migration
 // code.
 const char kMediaPlayerExperimentName[] = "media-player";
 const char kAdvancedFileSystemExperimentName[] = "advanced-file-system";
 const char kVerticalTabsExperimentName[] = "vertical-tabs";
 
 const Experiment::Choice kPrerenderFromOmniboxChoices[] = {
   { IDS_FLAGS_PRERENDER_FROM_OMNIBOX_AUTOMATIC, "", "" },
   { IDS_FLAGS_PRERENDER_FROM_OMNIBOX_ENABLED, switches::kPrerenderFromOmnibox,
     switches::kPrerenderFromOmniboxSwitchValueEnabled },
@@ skipping 569 matching lines @@
 
 ListValue* GetFlagsExperimentsData(PrefService* prefs) {
   std::set<std::string> enabled_experiments;
   GetSanitizedEnabledFlags(prefs, &enabled_experiments);
 
   int current_platform = GetCurrentPlatform();
 
   ListValue* experiments_data = new ListValue();
   for (size_t i = 0; i < num_experiments; ++i) {
     const Experiment& experiment = experiments[i];
-    if (!(experiment.supported_platforms & current_platform))
-      continue;
 
     DictionaryValue* data = new DictionaryValue();
     data->SetString("internal_name", experiment.internal_name);
     data->SetString("name",
                     l10n_util::GetStringUTF16(experiment.visible_name_id));
     data->SetString("description",
                     l10n_util::GetStringUTF16(
                         experiment.visible_description_id));
+    bool supported = experiment.supported_platforms & current_platform;
+    data->SetBoolean("supported", supported);
+
+    ListValue* supported_platforms = new ListValue();
+    AddOsStrings(experiment.supported_platforms, supported_platforms);
+    data->Set("supported_platforms", supported_platforms);
 
     switch (experiment.type) {
       case Experiment::SINGLE_VALUE:
         data->SetBoolean(
             "enabled",
             enabled_experiments.count(experiment.internal_name) > 0);
         break;
       case Experiment::MULTI_VALUE:
         data->Set("choices", CreateChoiceData(experiment, enabled_experiments));
         break;
@@ skipping 211 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags