Remove MOJO_SHELL_CLIENT define.

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_delegate_aura.h"
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_types.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/ui/autoclick_ring_handler.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"
 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
-#if defined(MOJO_SHELL_CLIENT)
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
-#endif
-
 namespace chrome {
 
 void OpenAsh(gfx::AcceleratedWidget remote_window) {
 #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();
   }
@@ skipping 39 matching lines @@
       magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableZeroBrowsersOpenForTests)) {
     g_browser_process->platform_part()->RegisterKeepAlive();
   }
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 void InitializeMash() {
-#if defined(MOJO_SHELL_CLIENT)
   DCHECK(!ash::Shell::HasInstance());
   ChromeLauncherControllerMus::CreateInstance()->Init();
-#endif
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
     ash::ShellContentState::DestroyInstance();
   }
 }
 
 }  // namespace chrome