Shutdown cleanup

mojo/examples/browser/browser.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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 187 matching lines @@
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
                            view_manager::Node* root) OVERRIDE {
     // TODO: deal with OnRootAdded() being invoked multiple times.
     view_manager_ = view_manager;
     root_ = root;
     root_->AddObserver(this);
     root_->SetActiveView(view_manager::View::Create(view_manager));
     root_->SetFocus();
     CreateWidget(root_);
   }
+  virtual void OnViewManagerDisconnected(
+      view_manager::ViewManager* view_manager) OVERRIDE {
+    DCHECK_EQ(view_manager_, view_manager);
+    view_manager_ = NULL;
+    base::MessageLoop::current()->Quit();
+  }
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
     if (key_event.key_code() == ui::VKEY_RETURN) {
       GURL url(sender->text());
       printf("User entered this URL: %s\n", url.spec().c_str());
       navigation::NavigationDetailsPtr nav_details(
           navigation::NavigationDetails::New());
       nav_details->url = url.spec();
       navigator_host_->RequestNavigate(view_manager_->GetRoots().front()->id(),
                                        navigation::NEW_NODE,
                                        nav_details.Pass());
     }
     return false;
   }
 
   // NodeObserver:
   virtual void OnNodeFocusChanged(view_manager::Node* gained_focus,
                                   view_manager::Node* lost_focus) OVERRIDE {
     aura::client::FocusClient* focus_client =
         aura::client::GetFocusClient(widget_->GetNativeView());
     if (lost_focus == root_)
       focus_client->FocusWindow(NULL);
     else if (gained_focus == root_)
       focus_client->FocusWindow(widget_->GetNativeView());
   }
+  virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE {
+    DCHECK_EQ(root_, node);
+    node->RemoveObserver(this);
+  }
 
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
   view_manager::Node* root_;
   views::Widget* widget_;
   navigation::NavigatorHostPtr navigator_host_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo