Use app_list_service_disabled in Athena

chrome/browser/ui/ash/ash_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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.
   return ash::Shell::HasInstance();
 #endif
 
   if (!ash::Shell::HasInstance())
     return false;
 
   aura::Window::Windows root_windows =
       ash::Shell::GetInstance()->GetAllRootWindows();
 
   for (aura::Window::Windows::const_iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
     if ((*it)->Contains(native_view))
       return true;
   }
 
   return false;
 }
 
 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
   return IsNativeViewInAsh(native_window);
 }
 
 }  // namespace chrome