Shutdown cleanup

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.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 "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/connect.h"
@@ skipping 79 matching lines @@
  public:
   explicit RootObserver(Node* root) : root_(root) {}
   virtual ~RootObserver() {}
 
  private:
   // Overridden from NodeObserver:
   virtual void OnNodeDestroyed(Node* node) OVERRIDE {
     DCHECK_EQ(node, root_);
     static_cast<ViewManagerClientImpl*>(
         NodePrivate(root_).view_manager())->RemoveRoot(root_);
+    node->RemoveObserver(this);
     delete this;
   }
 
   Node* root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
 
 class ViewManagerTransaction {
  public:
@@ skipping 418 matching lines @@
 ViewManagerClientImpl::ViewManagerClientImpl(ApplicationConnection* connection,
                                              ViewManagerDelegate* delegate)
     : connected_(false),
       connection_id_(0),
       next_id_(1),
       next_server_change_id_(0),
       delegate_(delegate),
       dispatcher_(NULL) {}
 
 ViewManagerClientImpl::~ViewManagerClientImpl() {
+  delegate_->OnViewManagerDisconnected(this);
   while (!nodes_.empty()) {
     IdToNodeMap::iterator it = nodes_.begin();
     if (OwnsNode(it->second->id()))
       it->second->Destroy();
     else
       nodes_.erase(it);
   }
   while (!views_.empty()) {
     IdToViewMap::iterator it = views_.begin();
     if (OwnsView(it->second->id()))
@@ skipping 348 matching lines @@
 
 // static
 void ViewManager::ConfigureIncomingConnection(
     ApplicationConnection* connection,
     ViewManagerDelegate* delegate) {
   connection->AddService<ViewManagerClientImpl>(delegate);
 }
 
 }  // namespace view_manager
 }  // namespace mojo