| Index: chrome/browser/ui/ash/ash_init.cc
|
| diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
|
| index ceca12f8c28ee425ed3565c48364a00467378a09..ad74f02d0c225408fd9522005109c0b33039f717 100644
|
| --- a/chrome/browser/ui/ash/ash_init.cc
|
| +++ b/chrome/browser/ui/ash/ash_init.cc
|
| @@ -29,6 +29,7 @@
|
| #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"
|
| @@ -43,10 +44,6 @@
|
| #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) {
|
| @@ -106,10 +103,8 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
|
| }
|
|
|
| void InitializeMash() {
|
| -#if defined(MOJO_SHELL_CLIENT)
|
| DCHECK(!ash::Shell::HasInstance());
|
| ChromeLauncherControllerMus::CreateInstance()->Init();
|
| -#endif
|
| }
|
|
|
| void CloseAsh() {
|
|
|