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

Unified Diff: shell/app_child_process.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/app_child_process.cc
diff --git a/shell/app_child_process.cc b/shell/app_child_process.cc
index 3a00843a7aa53f08a708c5a2ec9ac54146b8d2cd..03408263db5426b81e3e20463fc28588d6cf38ca 100644
--- a/shell/app_child_process.cc
+++ b/shell/app_child_process.cc
@@ -184,13 +184,13 @@ class AppChildControllerImpl : public InterfaceImpl<AppChildController> {
// |AppChildController| methods:
void StartApp(const String& app_path,
- ScopedMessagePipeHandle service) override {
+ InterfaceRequest<Application> application_request) override {
DVLOG(2) << "AppChildControllerImpl::StartApp(" << app_path << ", ...)";
DCHECK(thread_checker_.CalledOnValidThread());
unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread,
base::FilePath::FromUTF8Unsafe(app_path),
- base::Passed(&service)));
+ base::Passed(&application_request)));
}
private:
@@ -205,15 +205,17 @@ class AppChildControllerImpl : public InterfaceImpl<AppChildController> {
channel_info_ = channel_info;
}
- static void StartAppOnMainThread(const base::FilePath& app_path,
- ScopedMessagePipeHandle service) {
+ static void StartAppOnMainThread(
+ const base::FilePath& app_path,
+ InterfaceRequest<Application> application_request) {
// TODO(vtl): This is copied from in_process_dynamic_service_runner.cc.
DVLOG(2) << "Loading/running Mojo app from " << app_path.value()
<< " out of process";
// We intentionally don't unload the native library as its lifetime is the
// same as that of the process.
- DynamicServiceRunner::LoadAndRunService(app_path, service.Pass());
+ DynamicServiceRunner::LoadAndRunService(app_path,
+ application_request.Pass());
}
base::ThreadChecker thread_checker_;

Powered by Google App Engine
This is Rietveld 408576698