Use app_list_service_disabled in Athena

chrome/browser/ui/ash/ash_init.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_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace chrome {
 
-bool ShouldOpenAshOnStartup() {
-#if defined(OS_CHROMEOS)
-  return true;
-#endif
-  // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
-  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
-}
-
 void OpenAsh(gfx::AcceleratedWidget remote_window) {
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     // Hides the cursor outside of the Aura root window. The cursor will be
     // drawn within the Aura root window, and it'll remain hidden after the
     // Aura window is closed.
     ui::HideHostCursor();
   }
 #endif
@@ skipping 42 matching lines @@
 #endif
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance())
     ash::Shell::DeleteInstance();
 }
 
 }  // namespace chrome