Removed experimental app list flags. Experimental is now the only way.

ui/app_list/app_list_switches.cc

 // Copyright 2013 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 "ui/app_list/app_list_switches.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 
 namespace app_list {
 namespace switches {
 
 // Specifies the chrome-extension:// URL for the contents of an additional page
 // added to the experimental app launcher.
 const char kCustomLauncherPage[] = "custom-launcher-page";
 
 // If set, the app list will not be dismissed when it loses focus. This is
 // useful when testing the app list or a custom launcher page. It can still be
 // dismissed via the other methods (like the Esc key).
 const char kDisableAppListDismissOnBlur[] = "disable-app-list-dismiss-on-blur";
 
 // If set, the app list will be enabled as if enabled from CWS.
 const char kEnableAppList[] = "enable-app-list";
 
-// If set, the app list will be centered and wide instead of tall.
-const char kEnableCenteredAppList[] = "enable-centered-app-list";
-
-// Enable/disable the experimental app list. If enabled, implies
-// --enable-centered-app-list.
-const char kEnableExperimentalAppList[] = "enable-experimental-app-list";
-const char kDisableExperimentalAppList[] = "disable-experimental-app-list";
-
 // Enable/disable syncing of the app list independent of extensions.
 const char kEnableSyncAppList[] = "enable-sync-app-list";
 const char kDisableSyncAppList[] = "disable-sync-app-list";
 
 // Enable/disable drive search in chrome launcher.
 const char kEnableDriveSearchInChromeLauncher[] =
     "enable-drive-search-in-app-launcher";
 const char kDisableDriveSearchInChromeLauncher[] =
     "disable-drive-search-in-app-launcher";
 
@@ skipping 19 matching lines @@
 bool IsVoiceSearchEnabled() {
   // Speech recognition in AppList is only for ChromeOS right now.
 #if defined(OS_CHROMEOS)
   return true;
 #else
   return false;
 #endif
 }
 
 bool IsExperimentalAppListEnabled() {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          kEnableExperimentalAppList))
-    return true;
-
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          kDisableExperimentalAppList))
-    return false;
-
-#if defined(OS_CHROMEOS)
+  // TODO(mgiuca): Remove this function. (https://crbug.com/531059)
   return true;
-#else
-  return false;
-#endif
 }
 
 bool IsCenteredAppListEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             kEnableCenteredAppList) ||
-         IsExperimentalAppListEnabled();
+  // TODO(mgiuca): Remove this function. (https://crbug.com/531059)
+  return true;
 }
 
 bool ShouldNotDismissOnBlur() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       kDisableAppListDismissOnBlur);
 }
 
 bool IsDriveAppsInAppListEnabled() {
 #if defined(OS_CHROMEOS)
   return true;
@@ skipping 13 matching lines @@
     return false;
 
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace switches
 }  // namespace app_list