Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1224)

Unified Diff: mojo/shell/app_container.cc

Issue 72123002: Work in progress for end-to-end bindings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mojo/examples/sample_app/sample_app.cc ('K') | « mojo/shell/app_container.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/app_container.cc
diff --git a/mojo/shell/app_container.cc b/mojo/shell/app_container.cc
index 221c871c1f99cb5dc7e2e96e794eba53b7b83555..00304839625fb6d7c56ed471808bee58b2e468f0 100644
--- a/mojo/shell/app_container.cc
+++ b/mojo/shell/app_container.cc
@@ -67,12 +67,16 @@ void AppContainer::Load(const GURL& app_url) {
void AppContainer::DidCompleteLoad(const GURL& app_url,
const base::FilePath& app_path) {
+ Handle shell_handle;
Handle app_handle;
- MojoResult result = CreateMessagePipe(&shell_handle_, &app_handle);
+ MojoResult result = CreateMessagePipe(&shell_handle, &app_handle);
if (result < MOJO_RESULT_OK) {
// Failure..
}
+ hello_world_service_.reset(
+ new examples::HelloWorldServiceImpl(shell_handle));
+
// Launch the app on its own thread.
// TODO(beng): Create a unique thread name.
thread_.reset(new base::Thread("app_thread"));
@@ -82,25 +86,17 @@ void AppContainer::DidCompleteLoad(const GURL& app_url,
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(context_, shell_handle_));
+ // native_viewport_controller_.reset(
+ // new services::NativeViewportController(context_, shell_handle_));
}
void AppContainer::AppCompleted() {
- native_viewport_controller_->Close();
+ hello_world_service_.reset();
+ // native_viewport_controller_->Close();
thread_.reset();
- Close(shell_handle_);
}
} // namespace shell
« mojo/examples/sample_app/sample_app.cc ('K') | « mojo/shell/app_container.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698