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

Unified Diff: services/shell/runner/host/child_process_base.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « services/shell/runner/host/child_process_base.h ('k') | services/shell/runner/host/child_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/runner/host/child_process_base.cc
diff --git a/services/shell/runner/host/child_process_base.cc b/services/shell/runner/host/child_process_base.cc
index 6508551ac2b36a13d51a5063a24a8320780d4128..b3daa76bf95f88647206c693a5cde39b5337aae2 100644
--- a/services/shell/runner/host/child_process_base.cc
+++ b/services/shell/runner/host/child_process_base.cc
@@ -15,19 +15,18 @@
#include "mojo/edk/embedder/process_delegate.h"
#include "services/shell/runner/common/client_util.h"
-namespace mojo {
namespace shell {
namespace {
// Should be created and initialized on the main thread and kept alive as long
// a Mojo application is running in the current process.
-class ScopedAppContext : public edk::ProcessDelegate {
+class ScopedAppContext : public mojo::edk::ProcessDelegate {
public:
ScopedAppContext()
: io_thread_("io_thread"), wait_for_shutdown_event_(true, false) {
// Initialize Mojo before starting any threads.
- edk::Init();
+ mojo::edk::Init();
// Create and start our I/O thread.
base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
@@ -35,12 +34,12 @@ class ScopedAppContext : public edk::ProcessDelegate {
io_runner_ = io_thread_.task_runner().get();
CHECK(io_runner_.get());
- edk::InitIPCSupport(this, io_runner_);
- edk::SetParentPipeHandleFromCommandLine();
+ mojo::edk::InitIPCSupport(this, io_runner_);
+ mojo::edk::SetParentPipeHandleFromCommandLine();
}
~ScopedAppContext() override {
- edk::ShutdownIPCSupport();
+ mojo::edk::ShutdownIPCSupport();
wait_for_shutdown_event_.Wait();
}
@@ -69,4 +68,3 @@ void ChildProcessMain(const RunCallback& callback) {
}
} // namespace shell
-} // namespace mojo
« no previous file with comments | « services/shell/runner/host/child_process_base.h ('k') | services/shell/runner/host/child_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698