Disable app list folders by default for non-ChromeOS platforms.

chrome/browser/about_flags.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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 1512 matching lines @@
     // This is compiled out on non-Linux platforms because otherwise it would be
     // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing.
     // TODO(mgiuca): Remove the #if when Aura is the default on Linux.
     "enable-app-list",
     IDS_FLAGS_ENABLE_APP_LIST_NAME,
     IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION,
     kOsLinux,
     SINGLE_VALUE_TYPE(switches::kEnableAppList)
   },
 #endif
+#if defined(OS_CHROMEOS)

[benwells, 2014/04/02 03:59:58]

Why guard this in #if, it is already guarded with the kOsCrOS thing?

[calamity, 2014/04/02 04:23:17]

Similar reason to --enable-app-list above. It would be visible in the bottom
section of the chrome://flags page.

I suppose the other option is to make it a combobox?

   {
     "disable-app-list-folder-ui",
     IDS_FLAGS_DISABLE_APP_LIST_FOLDER,
     IDS_FLAGS_DISABLE_APP_LIST_FOLDER_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
+    kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kDisableFolderUI)
   },
+#else
+  {
+    "enable-app-list-folder-ui",
+    IDS_FLAGS_ENABLE_APP_LIST_FOLDER,
+    IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION,
+    kOsWin | kOsLinux,
+    SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI)
+  },
+#endif
   {
     "disable-app-list-voice-search",
     IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
     IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
   },
   {
     "enable-app-list-hotword-always-on",
     IDS_FLAGS_ENABLE_APP_LIST_HOTWORD_ALWAYS_ON,
@@ skipping 814 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags