| Index: mash/shell/shell_application_delegate.cc
|
| diff --git a/mash/shell/shell_application_delegate.cc b/mash/shell/shell_application_delegate.cc
|
| index 30a59191629fb4a35ffbc38b4bea2cb712fd6edc..9da9736fbde77fbae7e0377cbf9afb14b0a38b63 100644
|
| --- a/mash/shell/shell_application_delegate.cc
|
| +++ b/mash/shell/shell_application_delegate.cc
|
| @@ -18,11 +18,16 @@ ShellApplicationDelegate::~ShellApplicationDelegate() {}
|
|
|
| void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
|
| app_ = app;
|
| +#if 0
|
| StartBrowserDriver();
|
| StartWindowManager();
|
| StartWallpaper();
|
| StartShelf();
|
| StartQuickLaunch();
|
| +#else
|
| + StartBrowserDriver();
|
| + StartWindowManager();
|
| +#endif
|
| }
|
|
|
| bool ShellApplicationDelegate::ConfigureIncomingConnection(
|
| @@ -46,9 +51,8 @@ void ShellApplicationDelegate::Create(
|
|
|
| void ShellApplicationDelegate::StartWindowManager() {
|
| StartRestartableService(
|
| - "mojo:desktop_wm",
|
| - base::Bind(&ShellApplicationDelegate::StartWindowManager,
|
| - base::Unretained(this)));
|
| + "mojo:ash_wm", base::Bind(&ShellApplicationDelegate::StartWindowManager,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void ShellApplicationDelegate::StartWallpaper() {
|
|
|