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

Unified Diff: mojo/runner/context.cc

Issue 1501343002: Prepare chrome to use the new Mojo EDK by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable turning on in this cl Created 5 years 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
« content/test/run_all_unittests.cc ('K') | « mojo/message_pump/handle_watcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/context.cc
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 3e47f6cf746da1405b2a9d18ae84237087a0a55d..db00a7d7df5f1a596ceab5e8dbc8319bef5f065c 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -287,7 +287,9 @@ void Context::Shutdown() {
TRACE_EVENT0("mojo_shell", "Context::Shutdown");
DCHECK_EQ(base::MessageLoop::current()->task_runner(),
task_runners_->shell_runner());
- embedder::ShutdownIPCSupport();
+ // Post a task in case OnShutdownComplete is called synchronously.
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(embedder::ShutdownIPCSupport));
// We'll quit when we get OnShutdownComplete().
base::MessageLoop::current()->Run();
}
« content/test/run_all_unittests.cc ('K') | « mojo/message_pump/handle_watcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698