cros: Enable Drive apps integration in app launcher.

ui/app_list/app_list_switches.cc

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 d0c77d276fe08e0e0d88ee7bc49aa5639d5ee8cd..37561fd693f7167967d3d2e7ab2dd13c1cfa8d35 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -12,15 +12,15 @@ namespace switches {
 // If set, the app info context menu item is not available in the app list UI.
 const char kDisableAppInfo[] = "disable-app-list-app-info";
 
+// 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";
 
-// If set, Drive apps of the user shows side-by-side with Chrome apps.
-const char kEnableDriveAppsInAppList[] = "enable-drive-apps-in-app-list";
-
 // If set, the experimental app list will be used. Implies
 // --enable-centered-app-list.
 const char kEnableExperimentalAppList[] = "enable-experimental-app-list";
@@ -73,7 +73,12 @@ bool IsCenteredAppListEnabled() {
 }
 
 bool IsDriveAppsInAppListEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(kEnableDriveAppsInAppList);
+#if defined(OS_CHROMEOS)
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      kDisableDriveAppsInAppList);
+#else
+  return false;
+#endif
 }
 
 }  // namespace switches