NativeViewport

mojo/shell/app_container.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/shell/app_container.h"
 
 #include "base/bind.h"
 #include "base/callback_forward.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/native_library.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "mojo/public/system/core.h"
+#include "mojo/services/native_viewport/native_viewport_controller.h"
 #include "mojo/shell/context.h"
 
 typedef MojoResult (*MojoMainFunction)(mojo::Handle pipe);
 
 namespace mojo {
 namespace shell {
 
 void LaunchAppOnThread(
     const base::FilePath& app_path,
     Handle app_handle) {
@@ skipping 57 matching lines @@
       base::Bind(&LaunchAppOnThread, app_path, app_handle),
       base::Bind(&AppContainer::AppCompleted, weak_factory_.GetWeakPtr()));
 
   const char* hello_msg = "Hello";
   result = WriteMessage(shell_handle_, hello_msg,
                         static_cast<uint32_t>(strlen(hello_msg)+1),
                         NULL, 0, MOJO_WRITE_MESSAGE_FLAG_NONE);
   if (result < MOJO_RESULT_OK) {
     // Failure..
   }
+
+  // TODO(beng): This should be created on demand by the NativeViewportService
+  //             when it is retrieved by the app.
+  native_viewport_controller_.reset(
+      new services::NativeViewportController(shell_handle_));
 }
 
 void AppContainer::AppCompleted() {
+  native_viewport_controller_->Close();
+
   thread_.reset();
   Close(shell_handle_);
-
-  // Probably want to do something more sophisticated here, like notify someone
-  // else to do this.
-  base::MessageLoop::current()->Quit();
 }
 
 }  // namespace shell
 }  // namespace mojo