Removed Labs section from Chrome OS settings page.

chrome/browser/about_flags.cc

 // Copyright (c) 2010 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>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/singleton.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 
 namespace about_flags {
 
 namespace {
 
 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS;
 
+// 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 kExperiments[] = {
   {
     "expose-for-tabs",  // Do not change; see above.
     IDS_FLAGS_TABPOSE_NAME,
     IDS_FLAGS_TABPOSE_DESCRIPTION,
     kOsMac,
 #if defined(OS_MACOSX)
     // The switch exists only on OS X.
     switches::kEnableExposeForTabs
 #else
     ""
 #endif
   },
   {
-    "vertical-tabs",  // Do not change; see above.
+    kMediaPlayerExperimentName,
+    IDS_FLAGS_MEDIA_PLAYER_NAME,
+    IDS_FLAGS_MEDIA_PLAYER_DESCRIPTION,
+    kOsCrOS,
+#if defined(OS_CHROMEOS)
+    // The switch exists only on Chrome OS.
+    switches::kEnableMediaPlayer
+#else
+    ""
+#endif
+  },
+  {
+    kAdvancedFileSystemExperimentName,
+    IDS_FLAGS_ADVANCED_FS_NAME,
+    IDS_FLAGS_ADVANCED_FS_DESCRIPTION,
+    kOsCrOS,
+#if defined(OS_CHROMEOS)
+    // The switch exists only on Chrome OS.
+    switches::kEnableAdvancedFileSystem
+#else
+    ""
+#endif
+  },
+  {
+    kVerticalTabsExperimentName,
     IDS_FLAGS_SIDE_TABS_NAME,
     IDS_FLAGS_SIDE_TABS_DESCRIPTION,
-    // TODO(thakis): Move sidetabs to about:flags on ChromeOS
-    // http://crbug.com/57634
-    kOsWin,
+    kOsWin | kOsCrOS,
     switches::kEnableVerticalTabs
   },
   {
     "tabbed-options",  // Do not change; see above.
     IDS_FLAGS_TABBED_OPTIONS_NAME,
     IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION,
     kOsWin | kOsLinux | kOsMac,  // Enabled by default on CrOS.
     switches::kEnableTabbedOptions
   },
   {
@@ skipping 164 matching lines @@
     return Singleton<FlagsState>::get();
   }
 
  private:
   bool needs_restart_;
   std::set<std::string> flags_switches_;
 
   DISALLOW_COPY_AND_ASSIGN(FlagsState);
 };
 
+#if defined(OS_CHROMEOS)
+void MigrateChromeOSLabsPrefs(const PrefService* prefs,
+                              std::set<std::string>* result) {
+  DCHECK(prefs);
+  DCHECK(result);
+  if (prefs->GetBoolean(prefs::kLabsMediaplayerEnabled))
+    result->insert(kMediaPlayerExperimentName);
+  if (prefs->GetBoolean(prefs::kLabsAdvancedFilesystemEnabled))
+    result->insert(kAdvancedFileSystemExperimentName);
+  if (prefs->GetBoolean(prefs::kUseVerticalTabs))
+    result->insert(kVerticalTabsExperimentName);

[Nico, 2010/11/16 17:32:07]

do you want to remove the booleans from |prefs| after migrating them?

[whywhat, 2010/11/16 17:55:15]

Can I remove them? I only found how I can set them to false which should be
enough for now.

[Nico, 2010/11/16 18:01:31]

PrefService::ClearPref

[whywhat, 2010/11/16 18:05:03]

This sets the value to default one. If it ever becomes true, we'll turn it on on
the next login even if user turns it off via about:flags.

+}
+#endif
+
 // Extracts the list of enabled lab experiments from preferences and stores them
 // in a set.
 void GetEnabledFlags(const PrefService* prefs, std::set<std::string>* result) {
   const ListValue* enabled_experiments = prefs->GetList(
       prefs::kEnabledLabsExperiments);
   if (!enabled_experiments)
     return;
 
   for (ListValue::const_iterator it = enabled_experiments->begin();
        it != enabled_experiments->end();
        ++it) {
     std::string experiment_name;
     if (!(*it)->GetAsString(&experiment_name)) {
       LOG(WARNING) << "Invalid entry in " << prefs::kEnabledLabsExperiments;
       continue;
     }
     result->insert(experiment_name);
   }
+
+#if defined(OS_CHROMEOS)
+  // Some experiments were implemented via prefs on Chrome OS and we want to
+  // seamlessly migrate these prefs to about:flags for updated users.
+  MigrateChromeOSLabsPrefs(prefs, result);

[Nico, 2010/11/16 17:32:07]

I'd do this at the spot marked XXX below instead.

[whywhat, 2010/11/16 17:55:15]

Done.

+#endif
 }
 
 // Takes a set of enabled lab experiments
 void SetEnabledFlags(
     PrefService* prefs, const std::set<std::string>& enabled_experiments) {
   ListValue* experiments_list = prefs->GetMutableList(
       prefs::kEnabledLabsExperiments);
   if (!experiments_list)
     return;
 
@@ skipping 120 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 // FlagsState implementation.
 
 namespace {
 
 void FlagsState::ConvertFlagsToSwitches(
     PrefService* prefs, CommandLine* command_line) {
   if (command_line->HasSwitch(switches::kNoExperiments))
     return;
 
   std::set<std::string> enabled_experiments;

[Nico, 2010/11/16 17:32:07]

XXX

[whywhat, 2010/11/16 17:55:15]

Done.

   GetSanitizedEnabledFlagsForCurrentPlatform(prefs, &enabled_experiments);
 
   std::map<std::string, const Experiment*> experiment_map;
   for (size_t i = 0; i < num_experiments; ++i)
     experiment_map[experiments[i].internal_name] = &experiments[i];
 
   command_line->AppendSwitch(switches::kFlagSwitchesBegin);
   flags_switches_.insert(switches::kFlagSwitchesBegin);
   for (std::set<std::string>::iterator it = enabled_experiments.begin();
        it != enabled_experiments.end();
@@ skipping 58 matching lines @@
     num_experiments = arraysize(kExperiments);
   } else {
     experiments = e;
     num_experiments = count;
   }
 }
 
 }  // namespace testing
 
 }  // namespace about_flags