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

Unified Diff: shell/out_of_process_dynamic_service_runner.cc

Issue 981733002: Rename {In,OutOf}ProcessDynamicServiceRunner -> ...NativeRunner. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: remove incorrect/flaky NOTREACHED() Created 5 years, 10 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
« no previous file with comments | « shell/out_of_process_dynamic_service_runner.h ('k') | shell/out_of_process_native_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/out_of_process_dynamic_service_runner.cc
diff --git a/shell/out_of_process_dynamic_service_runner.cc b/shell/out_of_process_dynamic_service_runner.cc
deleted file mode 100644
index 20572a96699d24de42b137c42c9c2e0214c83e3d..0000000000000000000000000000000000000000
--- a/shell/out_of_process_dynamic_service_runner.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// 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 "shell/out_of_process_dynamic_service_runner.h"
-
-#include "base/bind.h"
-#include "base/callback_helpers.h"
-#include "base/files/file_util.h"
-#include "base/logging.h"
-#include "base/scoped_native_library.h"
-#include "shell/in_process_dynamic_service_runner.h"
-
-namespace mojo {
-namespace shell {
-
-OutOfProcessDynamicServiceRunner::OutOfProcessDynamicServiceRunner(
- Context* context)
- : context_(context) {
-}
-
-OutOfProcessDynamicServiceRunner::~OutOfProcessDynamicServiceRunner() {
- if (app_child_process_host_) {
- // TODO(vtl): Race condition: If |AppChildProcessHost::DidStart()| hasn't
- // been called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we
- // may not have a child process to wait on.) Probably we should fix
- // |Join()|.
- app_child_process_host_->Join();
- }
-}
-
-void OutOfProcessDynamicServiceRunner::Start(
- const base::FilePath& app_path,
- mojo::NativeRunner::CleanupBehavior cleanup_behavior,
- InterfaceRequest<Application> application_request,
- const base::Closure& app_completed_callback) {
- app_path_ = app_path;
-
- DCHECK(app_completed_callback_.is_null());
- app_completed_callback_ = app_completed_callback;
-
- app_child_process_host_.reset(new AppChildProcessHost(context_));
- app_child_process_host_->Start();
-
- // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe.
- app_child_process_host_->StartApp(
- app_path.AsUTF8Unsafe(), cleanup_behavior == DeleteAppPath,
- application_request.Pass(),
- base::Bind(&OutOfProcessDynamicServiceRunner::AppCompleted,
- base::Unretained(this)));
-}
-
-void OutOfProcessDynamicServiceRunner::AppCompleted(int32_t result) {
- DVLOG(2) << "OutOfProcessDynamicServiceRunner::AppCompleted(" << result
- << ")";
-
- app_child_process_host_.reset();
- // This object may be deleted by this callback.
- base::Closure app_completed_callback = app_completed_callback_;
- app_completed_callback_.Reset();
- app_completed_callback.Run();
-}
-
-scoped_ptr<NativeRunner> OutOfProcessDynamicServiceRunnerFactory::Create(
- const Options& options) {
- if (options.force_in_process)
- return make_scoped_ptr(new InProcessDynamicServiceRunner(context_));
-
- return make_scoped_ptr(new OutOfProcessDynamicServiceRunner(context_));
-}
-
-} // namespace shell
-} // namespace mojo
« no previous file with comments | « shell/out_of_process_dynamic_service_runner.h ('k') | shell/out_of_process_native_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698