Remove OnRootRemoved from ViewManagerDelegate

mojo/examples/embedded_app/embedded_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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application.h"
@@ skipping 70 matching lines @@
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     View* view = View::Create(view_manager);
     view->AddObserver(this);
     root->SetActiveView(view);
     root->AddObserver(this);
 
     roots_[root->id()] = root;
     ProcessPendingNodeColor(root->id());
   }
-  virtual void OnRootRemoved(ViewManager* view_manager, Node* root) OVERRIDE {
-    roots_.erase(root->id());
-
-    std::map<Node*, View*>::const_iterator it = views_to_reap_.find(root);
-    if (it != views_to_reap_.end())
-      it->second->Destroy();
-  }
 
   // Overridden from ViewObserver:
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
     if (event->action == ui::ET_MOUSE_RELEASED)
       window_manager_->CloseWindow(view->node()->id());
   }
 
   // Overridden from NodeObserver:
   virtual void OnNodeActiveViewChange(
       Node* node,
       View* old_view,
       View* new_view,
       NodeObserver::DispositionChangePhase phase) OVERRIDE {
     if (new_view == 0)
       views_to_reap_[node] = old_view;
   }
+  virtual void OnNodeDestroy(
+      Node* node,
+      NodeObserver::DispositionChangePhase phase) OVERRIDE {
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
+      return;
+    DCHECK(roots_.find(node->id()) != roots_.end());
+    roots_.erase(node->id());
+    std::map<Node*, View*>::const_iterator it = views_to_reap_.find(node);
+    if (it != views_to_reap_.end())
+      it->second->Destroy();
+  }
 
   void ProcessPendingNodeColor(uint32 node_id) {
     RootMap::iterator root = roots_.find(node_id);
     if (root == roots_.end())
       return;
 
     PendingNodeColors::iterator color = pending_node_colors_.find(node_id);
     if (color == pending_node_colors_.end())
       return;
 
     root->second->active_view()->SetColor(color->second);
     pending_node_colors_.erase(color);
   }
 
-
   view_manager::ViewManager* view_manager_;
   IWindowManagerPtr window_manager_;
   std::map<Node*, View*> views_to_reap_;
 
-  typedef std::map<uint32, Node*> RootMap;
+  typedef std::map<view_manager::Id, Node*> RootMap;
   RootMap roots_;
 
   // We can receive navigations for nodes we don't have yet.
   typedef std::map<uint32, SkColor> PendingNodeColors;
   PendingNodeColors pending_node_colors_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
 };
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::EmbeddedApp;
 }
 
 }  // namespace mojo