| 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 862c9f27d0d54cdc5f82aba1b3c4f5a6f238522a..0c47326aceb7a8101fea9d25600deb30f419e598 100644
|
| --- a/ui/app_list/app_list_switches.cc
|
| +++ b/ui/app_list/app_list_switches.cc
|
| @@ -50,18 +50,9 @@ const char kDisableNewAppListMixer[] = "disable-new-app-list-mixer";
|
| // list hasn't been enabled (as in kEnableAppList) yet.
|
| const char kResetAppListInstallState[] = "reset-app-list-install-state";
|
|
|
| -#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;
|
| -
|
| - if (!IsMacViewsAppListEnabled())
|
| - return false;
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList);
|
| #endif
|
| return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| kDisableSyncAppList);
|
| @@ -133,15 +124,5 @@ bool IsDriveSearchInChromeLauncherEnabled() {
|
| #endif
|
| }
|
|
|
| -#if defined(OS_MACOSX)
|
| -bool IsMacViewsAppListEnabled() {
|
| -#if defined(TOOLKIT_VIEWS)
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - kEnableMacViewsAppList);
|
| -#endif
|
| - return false;
|
| -}
|
| -#endif // defined(OS_MACOSX)
|
| -
|
| } // namespace switches
|
| } // namespace app_list
|
|
|