Remove OnRootRemoved from ViewManagerDelegate

mojo/examples/nesting_app/nesting_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/strings/stringprintf.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/services/navigation/navigation.mojom.h"
@@ skipping 16 matching lines @@
 namespace mojo {
 namespace examples {
 
 namespace {
 const char kEmbeddedAppURL[] = "mojo:mojo_embedded_app";
 }
 
 // An app that embeds another app.
 class NestingApp : public Application,
                    public ViewManagerDelegate,
-                   public ViewObserver {
+                   public ViewObserver,
+                   public NodeObserver {
  public:
   NestingApp() : nested_(NULL) {}
   virtual ~NestingApp() {}
 
  private:
   class Navigator : public InterfaceImpl<navigation::Navigator> {
    public:
     explicit Navigator(NestingApp* app) : app_(app) {}
    private:
     virtual void Navigate(uint32 node_id,
@@ skipping 12 matching lines @@
 
   // Overridden from Application:
   virtual void Initialize() MOJO_OVERRIDE {
     ViewManager::Create(this, this);
     ConnectTo<IWindowManager>("mojo:mojo_window_manager", &window_manager_);
     AddService<Navigator>(this);
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
+    root->AddObserver(this);
+
     View* view = View::Create(view_manager);
     root->SetActiveView(view);
     view->SetColor(SK_ColorCYAN);
     view->AddObserver(this);
 
     nested_ = Node::Create(view_manager);
     root->AddChild(nested_);
     nested_->SetBounds(gfx::Rect(20, 20, 50, 50));
     nested_->Embed(kEmbeddedAppURL);
 
     if (!navigator_.get())
       ConnectTo(kEmbeddedAppURL, &navigator_);
 
     NavigateChild();
   }
 
-  virtual void OnRootRemoved(ViewManager* view_manager, Node* root) OVERRIDE {
-    // TODO(beng): reap views & child nodes.
-    nested_ = NULL;
-  }
-
   // 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 OnNodeDestroy(
+      Node* node,
+      NodeObserver::DispositionChangePhase phase) OVERRIDE {
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
+      return;
+    // TODO(beng): reap views & child nodes.
+    nested_ = NULL;
+  }
+
+

[sky, 2014/06/17 16:56:53]

nit: only one newline.

   void NavigateChild() {
     if (!color_.empty() && nested_) {
       navigation::NavigationDetailsPtr details(
           navigation::NavigationDetails::New());
       details->url =
           base::StringPrintf("%s/%s", kEmbeddedAppURL, color_.c_str());
       navigator_->Navigate(nested_->id(), details.Pass());
     }
   }
 
   std::string color_;
   Node* nested_;
   navigation::NavigatorPtr navigator_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(NestingApp);
 };
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::NestingApp;
 }
 
 }  // namespace mojo