Shutdown cleanup

mojo/examples/window_manager/window_manager.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 "mojo/examples/keyboard/keyboard.mojom.h"
 #include "mojo/examples/window_manager/debug_panel.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"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_event_dispatcher.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
-#include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/views/views_init.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 #if defined CreateWindow
 #undef CreateWindow
 #endif
@@ skipping 150 matching lines @@
 
   Node* root_;
   ViewManager* view_manager_;
   Id content_node_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RootLayoutManager);
 };
 
 class WindowManager : public ApplicationDelegate,
                       public DebugPanel::Delegate,
-                      public ViewObserver,
                       public ViewManagerDelegate,
                       public ViewEventDispatcher {
  public:
   WindowManager()
       : launcher_ui_(NULL),
         view_manager_(NULL),
         app_(NULL) {
   }
 
   virtual ~WindowManager() {}
@@ skipping 70 matching lines @@
     ViewManager::ConfigureIncomingConnection(connection, this);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     DCHECK(!view_manager_);
     view_manager_ = view_manager;
     view_manager_->SetEventDispatcher(this);
 
-    Node* node = Node::Create(view_manager);
+    Node* node = Node::Create(view_manager_);
     root->AddChild(node);
     node->SetBounds(gfx::Rect(root->bounds().size()));
     content_node_id_ = node->id();
 
     root_layout_manager_.reset(
-        new RootLayoutManager(view_manager, root, content_node_id_));
+        new RootLayoutManager(view_manager_, root, content_node_id_));
     root->AddObserver(root_layout_manager_.get());
 
-    View* view = View::Create(view_manager);
+    View* view = View::Create(view_manager_);
     node->SetActiveView(view);
     view->SetColor(SK_ColorBLUE);
-    view->AddObserver(this);
 
     CreateLauncherUI();
     CreateControlPanel(node);
   }
+  virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
+    DCHECK_EQ(view_manager_, view_manager);
+    view_manager_ = NULL;
+    base::MessageLoop::current()->Quit();
+  }
 
   // Overridden from ViewEventDispatcher:
   virtual void DispatchEvent(View* target, EventPtr event) OVERRIDE {
     // TODO(beng): More sophisticated focus handling than this is required!
     if (event->action == ui::ET_MOUSE_PRESSED &&
         !IsDescendantOfKeyboard(target)) {
       target->node()->SetFocus();
     }
     view_manager_->DispatchEvent(target, event.Pass());
   }
@@ skipping 156 matching lines @@
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::WindowManager;
 }
 
 }  // namespace mojo