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

Unified Diff: ipc/mojo/scoped_ipc_support.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 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 | « ipc/mojo/scoped_ipc_support.h ('k') | mash/example/window_type_launcher/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/scoped_ipc_support.cc
diff --git a/ipc/mojo/scoped_ipc_support.cc b/ipc/mojo/scoped_ipc_support.cc
index 15575444e64f15dac84c32131ff126004dd8affc..bcaa3a15cc57e3b131522c4a983d04e4f6a74852 100644
--- a/ipc/mojo/scoped_ipc_support.cc
+++ b/ipc/mojo/scoped_ipc_support.cc
@@ -15,15 +15,13 @@
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/thread_task_runner_handle.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/process_delegate.h"
namespace IPC {
namespace {
-// TODO(use_chrome_edk)
-//class IPCSupportInitializer : public mojo::edk::ProcessDelegate {
-class IPCSupportInitializer : public mojo::embedder::ProcessDelegate {
+class IPCSupportInitializer : public mojo::edk::ProcessDelegate {
public:
IPCSupportInitializer()
: init_count_(0),
@@ -62,7 +60,7 @@ class IPCSupportInitializer : public mojo::embedder::ProcessDelegate {
void ShutDownOnIOThread();
- // mojo::embedder::ProcessDelegate:
+ // mojo::edk::ProcessDelegate:
void OnShutdownComplete() override {}
static void WatchMessageLoopOnIOThread(MessageLoopObserver* observer);
@@ -106,9 +104,7 @@ void IPCSupportInitializer::Init(
io_thread_task_runner_ = io_thread_task_runner;
io_thread_task_runner_->PostTask(
FROM_HERE, base::Bind(&WatchMessageLoopOnIOThread, observer_));
- mojo::embedder::InitIPCSupport(
- mojo::embedder::ProcessType::NONE, this, io_thread_task_runner_,
- mojo::embedder::ScopedPlatformHandle());
+ mojo::edk::InitIPCSupport(this, io_thread_task_runner_);
}
}
@@ -137,7 +133,7 @@ void IPCSupportInitializer::ShutDown(bool force) {
void IPCSupportInitializer::ShutDownOnIOThread() {
base::AutoLock locker(lock_);
if (shutting_down_ && !was_shut_down_) {
- mojo::embedder::ShutdownIPCSupportOnIOThread();
+ mojo::edk::ShutdownIPCSupportOnIOThread();
init_count_ = 0;
shutting_down_ = false;
io_thread_task_runner_ = nullptr;
« no previous file with comments | « ipc/mojo/scoped_ipc_support.h ('k') | mash/example/window_type_launcher/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698