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

Unified Diff: shell/dynamic_service_runner.cc

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 months 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
Index: shell/dynamic_service_runner.cc
diff --git a/shell/dynamic_service_runner.cc b/shell/dynamic_service_runner.cc
index fc0a0abc72bc9c3e1e2721a1db7d682ac5ae2b55..768f03197cc32385ca80f9c3594a6ebdbe03fbc0 100644
--- a/shell/dynamic_service_runner.cc
+++ b/shell/dynamic_service_runner.cc
@@ -40,7 +40,7 @@ bool SetThunks(Thunks (*make_thunks)(),
base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
const base::FilePath& app_path,
- ScopedMessagePipeHandle service_handle) {
+ InterfaceRequest<Application> application_request) {
DVLOG(2) << "Loading/running Mojo app in process from library: "
<< app_path.value();
base::NativeLibraryLoadError error;
@@ -98,7 +98,8 @@ base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
break;
}
// |MojoMain()| takes ownership of the service handle.
- MojoResult result = main_function(service_handle.release().value());
+ MojoHandle handle = application_request.PassMessagePipe().release().value();
+ MojoResult result = main_function(handle);
if (result < MOJO_RESULT_OK) {
LOG(ERROR) << app_path.value() << " MojoMain returned error(" << result
<< ")";

Powered by Google App Engine
This is Rietveld 408576698