Shutdown cleanup

mojo/services/view_manager/window_tree_host_impl.cc

 // Copyright 2013 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/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/window_tree_host_impl.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/view_manager/context_factory_impl.h"
 #include "ui/aura/env.h"
@@ skipping 50 matching lines @@
                                        const gfx::Rect& requested_bounds) {
   SetChildBoundsDirect(child, gfx::Rect(requested_bounds.size()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, public:
 
 WindowTreeHostImpl::WindowTreeHostImpl(
     NativeViewportPtr viewport,
     const gfx::Rect& bounds,
-    const base::Callback<void()>& compositor_created_callback)
+    const Callback<void()>& compositor_created_callback,
+    const Callback<void()>& native_viewport_closed_callback)
     : native_viewport_(viewport.Pass()),
       compositor_created_callback_(compositor_created_callback),
+      native_viewport_closed_callback_(native_viewport_closed_callback),
       bounds_(bounds) {
   native_viewport_.set_client(this);
   native_viewport_->Create(Rect::From(bounds));
 
   MessagePipe pipe;
   native_viewport_->CreateGLES2Context(
       MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
 
   // The ContextFactory must exist before any Compositors are created.
   if (context_factory_) {
@@ skipping 87 matching lines @@
 void WindowTreeHostImpl::OnCreated() {
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
 }
 
 void WindowTreeHostImpl::OnBoundsChanged(RectPtr bounds) {
   bounds_ = bounds.To<gfx::Rect>();
   OnHostResized(bounds_.size());
 }
 
-void WindowTreeHostImpl::OnDestroyed() {
-  base::MessageLoop::current()->Quit();
+void WindowTreeHostImpl::OnDestroyed(const mojo::Callback<void()>& callback) {
+  DestroyCompositor();
+  native_viewport_closed_callback_.Run();
+  //base::MessageLoop::current()->Quit();

[sky, 2014/07/10 22:54:29]

remove commented out code.

+  callback.Run();
 }
 
 void WindowTreeHostImpl::OnEvent(EventPtr event,
                                  const mojo::Callback<void()>& callback) {
   switch (event->action) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_MOUSE_DRAGGED:
     case ui::ET_MOUSE_RELEASED:
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_ENTERED:
@@ skipping 22 matching lines @@
       break;
     }
     // TODO(beng): touch, etc.
   }
   callback.Run();
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo