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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 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: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 8a9a37de8ab6eec4c2bd228c0283ea38fdf180c8..ec16a4032665e37a60e99a18e09829978c82cb6b 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -69,6 +69,7 @@
#include "net/base/network_change_notifier.h"
#include "net/socket/client_socket_factory.h"
#include "net/ssl/ssl_config_service.h"
+#include "ipc/mojo/scoped_ipc_support.h"
#include "skia/ext/skia_memory_dump_provider.h"
#include "ui/base/clipboard/clipboard.h"
@@ -927,6 +928,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
true));
+ mojo_ipc_support_.reset();
mojo_shell_context_.reset();
#if !defined(OS_IOS)
@@ -1266,6 +1268,9 @@ int BrowserMainLoop::BrowserThreadsStarted() {
#endif // !defined(OS_IOS)
mojo_shell_context_.reset(new MojoShellContext);
+ mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(
+ BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
+ ->task_runner()));
return result_code_;
}

Powered by Google App Engine
This is Rietveld 408576698