Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: ui/app_list/app_list_switches.cc

Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: drop patchset dependency, rebase to master Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..cd95422f0b0aa4d891f84423dde29159b8b78be2 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -50,18 +50,12 @@ 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 false;
Matt Giuca 2016/05/03 07:31:16 Removing the enable-mac-views-app-list switch is a
tapted 2016/05/04 09:55:43 OK you twisted my arm :p
Matt Giuca 2016/05/05 00:26:30 Ever so slightly...
#endif
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
kDisableSyncAppList);
@@ -133,15 +127,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

Powered by Google App Engine
This is Rietveld 408576698