Make Mandoline shut down cleanly.

components/window_manager/window_manager_app.cc

 // Copyright 2014 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 "components/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
@@ skipping 146 matching lines @@
 }
 
 void WindowManagerApp::LaunchViewManager(mojo::ApplicationImpl* app) {
   // TODO(sky): figure out logic if this connection goes away.
   view_manager_client_factory_.reset(
       new mojo::ViewManagerClientFactory(shell_, this));
 
   ApplicationConnection* view_manager_app =
       app->ConnectToApplication("mojo:view_manager");
   view_manager_app->ConnectToService(&view_manager_service_);
+  view_manager_service_.set_error_handler(this);
 
   view_manager_app->AddService<WindowManagerInternal>(this);
 
   view_manager_app->ConnectToService(&window_manager_client_);
 }
 
 void WindowManagerApp::Create(
     ApplicationConnection* connection,
     mojo::InterfaceRequest<WindowManagerInternal> request) {
   if (wm_internal_binding_.get()) {
@@ skipping 21 matching lines @@
               view_manager_client_request.Pass()),
           view_manager_service_.Pass(), shell_, this));
 }
 
 void WindowManagerApp::OnAccelerator(mojo::EventPtr event) {
   window_manager_delegate_->OnAcceleratorPressed(
       root_->view_manager()->GetFocusedView(),
       event->key_data->windows_key_code, event->flags);
 }
 
+void WindowManagerApp::OnConnectionError() {
+  mojo::ApplicationImpl::Terminate();
+}
+
 }  // namespace window_manager