[exp] ash: Ash in Mus.

mash/shell/shell_application_delegate.cc

 // Copyright 2015 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 "mash/shell/shell_application_delegate.h"
 
 #include "base/bind.h"
 #include "mash/screenlock/public/interfaces/screenlock.mojom.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace shell {
 
 ShellApplicationDelegate::ShellApplicationDelegate() : app_(nullptr) {}
 
 ShellApplicationDelegate::~ShellApplicationDelegate() {}
 
 void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
   app_ = app;
+#if 0
   StartBrowserDriver();
   StartWindowManager();
   StartWallpaper();
   StartShelf();
   StartQuickLaunch();
+#else
+  StartBrowserDriver();
+  StartWindowManager();
+#endif
 }
 
 bool ShellApplicationDelegate::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<mash::shell::mojom::Shell>(this);
   return true;
 }
 
 void ShellApplicationDelegate::LockScreen() {
   StartScreenlock();
 }
 void ShellApplicationDelegate::UnlockScreen() {
   StopScreenlock();
 }
 
 void ShellApplicationDelegate::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mash::shell::mojom::Shell> r) {
   bindings_.AddBinding(this, std::move(r));
 }
 
 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() {
   StartRestartableService("mojo:wallpaper",
                           base::Bind(&ShellApplicationDelegate::StartWallpaper,
                                      base::Unretained(this)));
 }
 
 void ShellApplicationDelegate::StartShelf() {
   StartRestartableService("mojo:shelf",
@@ skipping 37 matching lines @@
   // TODO(beng): This would be the place to insert logic that counted restarts
   //             to avoid infinite crash-restart loops.
   scoped_ptr<mojo::ApplicationConnection> connection =
       app_->ConnectToApplication(url);
   connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback);
   connections_[url] = std::move(connection);
 }
 
 }  // namespace shell
 }  // namespace main