| Index: ui/app_list/app_list_switches.cc
|
| diff --git a/ui/app_list/app_list_switches.cc b/ui/app_list/app_list_switches.cc
|
| index 121ca279ac42a3326c76ca4765c04347103e136d..3d16aa6ee6471f54e318d88fc7eb4b363178ed01 100644
|
| --- a/ui/app_list/app_list_switches.cc
|
| +++ b/ui/app_list/app_list_switches.cc
|
| @@ -38,9 +38,6 @@ const char kDisableDriveSearchInChromeLauncher[] =
|
| const char kResetAppListInstallState[] = "reset-app-list-install-state";
|
|
|
| bool IsAppListSyncEnabled() {
|
| -#if defined(OS_MACOSX)
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList);
|
| -#endif
|
| return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| kDisableSyncAppList);
|
| }
|
| @@ -53,11 +50,7 @@ bool IsFolderUIEnabled() {
|
|
|
| bool IsVoiceSearchEnabled() {
|
| // Speech recognition in AppList is only for ChromeOS right now.
|
| -#if defined(OS_CHROMEOS)
|
| return true;
|
| -#else
|
| - return false;
|
| -#endif
|
| }
|
|
|
| bool ShouldNotDismissOnBlur() {
|
| @@ -66,15 +59,10 @@ bool ShouldNotDismissOnBlur() {
|
| }
|
|
|
| bool IsDriveAppsInAppListEnabled() {
|
| -#if defined(OS_CHROMEOS)
|
| return true;
|
| -#else
|
| - return false;
|
| -#endif
|
| }
|
|
|
| bool IsDriveSearchInChromeLauncherEnabled() {
|
| -#if defined(OS_CHROMEOS)
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| kEnableDriveSearchInChromeLauncher))
|
| return true;
|
| @@ -84,9 +72,6 @@ bool IsDriveSearchInChromeLauncherEnabled() {
|
| return false;
|
|
|
| return true;
|
| -#else
|
| - return false;
|
| -#endif
|
| }
|
|
|
| } // namespace switches
|
|
|