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

Unified Diff: shell/in_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/in_process_dynamic_service_runner.h ('k') | shell/in_process_dynamic_service_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/in_process_dynamic_service_runner.cc
diff --git a/shell/in_process_dynamic_service_runner.cc b/shell/in_process_dynamic_service_runner.cc
deleted file mode 100644
index 5249e9aee9a8fe19624cf8d151942aed5dc609b3..0000000000000000000000000000000000000000
--- a/shell/in_process_dynamic_service_runner.cc
+++ /dev/null
@@ -1,70 +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/in_process_dynamic_service_runner.h"
-
-#include "base/bind.h"
-#include "base/callback_helpers.h"
-#include "base/location.h"
-#include "base/message_loop/message_loop_proxy.h"
-#include "base/threading/platform_thread.h"
-
-namespace mojo {
-namespace shell {
-
-InProcessDynamicServiceRunner::InProcessDynamicServiceRunner(Context* context)
- : cleanup_behavior_(NativeRunner::DontDeleteAppPath),
- app_library_(nullptr) {
-}
-
-InProcessDynamicServiceRunner::~InProcessDynamicServiceRunner() {
- // It is important to let the thread exit before unloading the DSO (when
- // app_library_ is destructed), because the library may have registered
- // thread-local data and destructors to run on thread termination.
- if (thread_) {
- DCHECK(thread_->HasBeenStarted());
- DCHECK(!thread_->HasBeenJoined());
- thread_->Join();
- }
-}
-
-void InProcessDynamicServiceRunner::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;
- cleanup_behavior_ = cleanup_behavior;
-
- DCHECK(!application_request_.is_pending());
- application_request_ = application_request.Pass();
-
- DCHECK(app_completed_callback_runner_.is_null());
- app_completed_callback_runner_ =
- base::Bind(&base::TaskRunner::PostTask, base::MessageLoopProxy::current(),
- FROM_HERE, app_completed_callback);
-
- DCHECK(!thread_);
- thread_.reset(new base::DelegateSimpleThread(this, "app_thread"));
- thread_->Start();
-}
-
-void InProcessDynamicServiceRunner::Run() {
- DVLOG(2) << "Loading/running Mojo app in process from library: "
- << app_path_.value()
- << " thread id=" << base::PlatformThread::CurrentId();
-
- app_library_.Reset(LoadAndRunNativeApplication(app_path_, cleanup_behavior_,
- application_request_.Pass()));
- app_completed_callback_runner_.Run();
- app_completed_callback_runner_.Reset();
-}
-
-scoped_ptr<NativeRunner> InProcessDynamicServiceRunnerFactory::Create(
- const Options& options) {
- return make_scoped_ptr(new InProcessDynamicServiceRunner(context_));
-}
-
-} // namespace shell
-} // namespace mojo
« no previous file with comments | « shell/in_process_dynamic_service_runner.h ('k') | shell/in_process_dynamic_service_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698