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

Unified Diff: content/common/mojo/mojo_shell_connection_impl.cc

Issue 1801963002: Change primordial pipes to ShellClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase onto catalog CL Created 4 years, 9 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 | « content/common/mojo/mojo_shell_connection_impl.h ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mojo/mojo_shell_connection_impl.cc
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index c2c4139ccde27e686023d9057cbf8ef7523d73ec..5d38de8a9a9fcf319e7679c7d3424b5c18ab3012 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -14,7 +14,7 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
-#include "mojo/shell/runner/child/runner_connection.h"
+#include "mojo/shell/runner/common/client_util.h"
namespace content {
namespace {
@@ -59,15 +59,8 @@ MojoShellConnectionImpl* MojoShellConnectionImpl::Get() {
void MojoShellConnectionImpl::BindToRequestFromCommandLine() {
DCHECK(!shell_connection_);
-
- shell_connection_.reset(new mojo::ShellConnection(this));
- runner_connection_ =
- mojo::shell::RunnerConnection::Create(shell_connection_.get(),
- false /* exit_on_error */);
- if (!runner_connection_) {
- delete this;
- lazy_tls_ptr.Pointer()->Set(nullptr);
- }
+ shell_connection_.reset(new mojo::ShellConnection(
+ this, mojo::shell::GetShellClientRequestFromCommandLine()));
}
MojoShellConnectionImpl::MojoShellConnectionImpl(bool external) :
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698