Added flag --enable-new-app-list-mixer.

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"
 
 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, Drive apps will not be shown side-by-side with Chrome apps.
 const char kDisableDriveAppsInAppList[] = "disable-drive-apps-in-app-list";
 
-// Disables syncing of the app list independent of extensions.
-const char kDisableSyncAppList[] = "disable-sync-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";
 
-// Enables syncing of the app list independent of extensions.
+// Enable/disable syncing of the app list independent of extensions.
 const char kEnableSyncAppList[] = "enable-sync-app-list";
+const char kDisableSyncAppList[] = "disable-sync-app-list";
 
 // Enables launcher search provider api.
 const char kEnableLauncherSearchProviderApi[] =
     "enable-launcher-search-provider-api";
 
+// Enable/disable the new "blended" algorithm in app_list::Mixer. This is just
+// forcing the AppListMixer/Blended field trial.
+const char kEnableNewAppListMixer[] = "enable-new-app-list-mixer";
+const char kDisableNewAppListMixer[] = "disable-new-app-list-mixer";
+
 #if defined(OS_MACOSX)
 // Enables use of the toolkit-views app list on Mac.
 const char kEnableMacViewsAppList[] = "enable-mac-views-app-list";
 #endif
 
 bool IsAppListSyncEnabled() {
 #if defined(OS_MACOSX)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList))
     return true;
 
@@ skipping 69 matching lines @@
 #if defined(TOOLKIT_VIEWS)
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       kEnableMacViewsAppList);
 #endif
   return false;
 }
 #endif  // defined(OS_MACOSX)
 
 }  // namespace switches
 }  // namespace app_list