[exp] ash: sysui for mash

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 "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace shell {
 
 ShellApplicationDelegate::ShellApplicationDelegate()
     : app_(nullptr), screen_locked_(false) {}
 
 ShellApplicationDelegate::~ShellApplicationDelegate() {}
 
 void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
   app_ = app;
   StartBrowserDriver();
   StartWindowManager();
+#if 0
   StartWallpaper();
   StartShelf();
+#else
+  StartSysUI();
+#endif
   StartQuickLaunch();
 }
 
 bool ShellApplicationDelegate::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<mash::shell::mojom::Shell>(this);
   return true;
 }
 
 void ShellApplicationDelegate::AddScreenlockStateListener(
@@ skipping 55 matching lines @@
                  base::Unretained(this)));
 }
 
 void ShellApplicationDelegate::StartQuickLaunch() {
   StartRestartableService(
       "mojo:quick_launch",
       base::Bind(&ShellApplicationDelegate::StartQuickLaunch,
                  base::Unretained(this)));
 }
 
+void ShellApplicationDelegate::StartSysUI() {
+  StartRestartableService("mojo:ash_sysui",
+                          base::Bind(&ShellApplicationDelegate::StartSysUI,
+                                     base::Unretained(this)));
+}
+
 void ShellApplicationDelegate::StartScreenlock() {
   StartRestartableService(
       "mojo:screenlock",
       base::Bind(&ShellApplicationDelegate::StartScreenlock,
                  base::Unretained(this)));
 }
 
 void ShellApplicationDelegate::StopScreenlock() {
   auto connection = connections_.find("mojo:screenlock");
   DCHECK(connections_.end() != connection);
   connections_.erase(connection);
 }
 
 void ShellApplicationDelegate::StartRestartableService(
     const std::string& url,
     const base::Closure& restart_callback) {
   // 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