Use app_list_service_disabled in Athena

chrome/browser/ui/ash/ash_util.cc

Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index de8b919cffa99b1d67f288192468f1344f6973fb..10cb28c5e61adb52dc33abb18d16fe28aeae7e58 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -5,12 +5,22 @@
 #include "chrome/browser/ui/ash/ash_util.h"
 
 #include "ash/shell.h"
+#include "base/command_line.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/common/chrome_switches.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 namespace chrome {
 
+bool ShouldOpenAshOnStartup() {
+#if defined(OS_CHROMEOS)
+  return true;
+#endif

[oshima, 2014/10/11 01:20:36]

nit: #else, and include headers only for !cros.

+  // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
+}
+
 bool IsNativeViewInAsh(gfx::NativeView native_view) {
 #if defined(OS_CHROMEOS)
   // Optimization. There is only ash or only athena on ChromeOS.