| 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 db3fad2aa3425ae0850758bf8cd4499d7f686240..e9ab4aec4b87192b4e3c3660b2ace79df6a1710c 100644
|
| --- a/chrome/browser/ui/ash/ash_init.cc
|
| +++ b/chrome/browser/ui/ash/ash_init.cc
|
| @@ -38,6 +38,10 @@
|
| #include "ui/base/x/x11_util.h"
|
| #endif
|
|
|
| +#if defined(MOJO_SHELL_CLIENT)
|
| +#include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
|
| +#endif
|
| +
|
| namespace chrome {
|
|
|
| void OpenAsh(gfx::AcceleratedWidget remote_window) {
|
| @@ -101,6 +105,13 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
|
| ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
|
| }
|
|
|
| +void InitializeMash() {
|
| +#if defined(MOJO_SHELL_CLIENT)
|
| + DCHECK(!ash::Shell::HasInstance());
|
| + ChromeMashShelfController::CreateInstance();
|
| +#endif
|
| +}
|
| +
|
| void CloseAsh() {
|
| if (ash::Shell::HasInstance()) {
|
| ash::Shell::DeleteInstance();
|
|
|