content/common/mojo/mojo_shell_connection_impl.h - Issue 1915053004: mus/chrome: Always wait for the mojo shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1915053004: mus/chrome: Always wait for the mojo shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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:

Index: content/common/mojo/mojo_shell_connection_impl.h

diff --git a/content/common/mojo/mojo_shell_connection_impl.h b/content/common/mojo/mojo_shell_connection_impl.h

index 1cae10df7adf0d0d9e61bf49ef0c433812bfae9b..3ad19d239df3fa46800713cf319894035da983f1 100644

--- a/content/common/mojo/mojo_shell_connection_impl.h

+++ b/content/common/mojo/mojo_shell_connection_impl.h

@@ -39,14 +39,15 @@ class MojoShellConnectionImpl : public MojoShellConnection,

// command line. This must only be called once.

void BindToRequestFromCommandLine();

+ // TODO(rockot): Remove this. http://crbug.com/594852.

+ shell::ShellConnection* shell_connection() { return shell_connection_.get(); }

private:

friend class MojoShellConnection;

explicit MojoShellConnectionImpl(bool external);

~MojoShellConnectionImpl() override;

- void WaitForShellIfNecessary();

// shell::ShellClient:

void Initialize(shell::Connector* connector,

const shell::Identity& identity,