Shutdown cleanup

mojo/services/view_manager/root_view_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 "mojo/services/view_manager/root_view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/scoped_observer.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/services/view_manager/root_node_manager.h"
@@ skipping 98 matching lines @@
   }
 
  private:
   aura::Window* window_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
-RootViewManager::RootViewManager(ApplicationConnection* app_connection,
-                                 RootNodeManager* root_node,
-                                 RootViewManagerDelegate* delegate)
+RootViewManager::RootViewManager(
+    ApplicationConnection* app_connection,
+    RootNodeManager* root_node,
+    RootViewManagerDelegate* delegate,
+    const Callback<void()>& native_viewport_closed_callback)
     : delegate_(delegate),
       root_node_manager_(root_node),
       in_setup_(false) {
   screen_.reset(ScreenImpl::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   NativeViewportPtr viewport;
   app_connection->ConnectToService(
       "mojo:mojo_native_viewport_service", &viewport);
   window_tree_host_.reset(new WindowTreeHostImpl(
         viewport.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&RootViewManager::OnCompositorCreated,
-                   base::Unretained(this))));
+                   base::Unretained(this)),
+        native_viewport_closed_callback));
 }
 
 RootViewManager::~RootViewManager() {
   window_tree_client_.reset();
   window_tree_host_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 }
 
 void RootViewManager::OnCompositorCreated() {
   base::AutoReset<bool> resetter(&in_setup_, true);
@@ skipping 13 matching lines @@
   focus_client_->AddObserver(root_node_manager_);
 
   window_tree_host_->Show();
 
   delegate_->OnRootViewManagerWindowTreeHostCreated();
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo