Remove chrome://flags/#enable-app-list, move kEnableAppList to app_list::

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 <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 1127 matching lines @@
      IDS_FLAGS_DELEGATED_RENDERER_NAME,
      IDS_FLAGS_DELEGATED_RENDERER_DESCRIPTION,
      kOsAndroid,  // TODO(ccameron) Add mac support soon.
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDelegatedRenderer,
                                switches::kDisableDelegatedRenderer)},
 #endif
     {"max-tiles-for-interest-area",
      IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_NAME,
      IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_DESCRIPTION,
      kOsAll,
-     MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices)
-    },
+     MULTI_VALUE_TYPE(kMaxTilesForInterestAreaChoices)},
     {"enable-offer-store-unmasked-wallet-cards",
      IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS,
      IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(
          autofill::switches::kEnableOfferStoreUnmaskedWalletCards,
          autofill::switches::kDisableOfferStoreUnmaskedWalletCards)},
     {"enable-offline-auto-reload",
      IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME,
      IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION,
@@ skipping 177 matching lines @@
     {"enable-iframe-based-signin",
      IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME,
      IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION,
      kOsMac | kOsWin | kOsLinux,
      SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)},
     {"enable-google-profile-info",
      IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME,
      IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION,
      kOsMac | kOsWin | kOsLinux,
      SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)},
-    {"reset-app-list-install-state",
-     IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME,
-     IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION,
-     kOsMac | kOsWin | kOsLinux,
-     SINGLE_VALUE_TYPE(switches::kResetAppListInstallState)},
-#if defined(ENABLE_APP_LIST)
-#if defined(OS_LINUX)
-    {// 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(ENABLE_EXTENSIONS)
     {"enable-surface-worker",

[tapted, 2015/06/25 06:07:38]

note this was also under #ifdef ENABLE_APP_LIST, which is not right

[Matt Giuca, 2015/06/26 08:15:16]

Acknowledged.

      IDS_FLAGS_ENABLE_SURFACE_WORKER_NAME,
      IDS_FLAGS_ENABLE_SURFACE_WORKER_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(extensions::switches::kEnableSurfaceWorker)},
 #endif
+#if defined(ENABLE_APP_LIST)
+    {"reset-app-list-install-state",
+     IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME,
+     IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION,
+     kOsMac | kOsWin | kOsLinux,
+     SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)},
     {"disable-drive-apps-in-app-list",
      IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME,
      IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList)},
 #endif
 #if defined(OS_ANDROID)
     {"enable-accessibility-tab-switcher",
      IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
      IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
@@ skipping 1260 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags