content/child/child_thread_impl.h - Issue 1901513003: Re-land: "Use a token to initialise ChannelMojo and MojoApplication everywhere."

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/child/child_thread_impl.h

Issue 1901513003: Re-land: "Use a token to initialise ChannelMojo and MojoApplication everywhere." (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:

View side-by-side diff with in-line comments

Download patch

Index: content/child/child_thread_impl.h

diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h

index fe2cc28f1e916509272759e999691f3ca0e8f721..14763952589122d25ac00ae50e8819c4059ae3ec 100644

--- a/content/child/child_thread_impl.h

+++ b/content/child/child_thread_impl.h

@@ -221,8 +221,7 @@ class CONTENT_EXPORT ChildThreadImpl

// We create the channel first without connecting it so we can add filters

// prior to any messages being received, then connect it afterwards.

- void ConnectChannel(bool use_mojo_channel,

- mojo::ScopedMessagePipeHandle handle);

+ void ConnectChannel(bool use_mojo_channel, const std::string& ipc_token);

// IPC message handlers.

void OnShutdown();

@@ -305,7 +304,7 @@ struct ChildThreadImpl::Options {

bool use_mojo_channel;

scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner;

std::vector<IPC::MessageFilter*> startup_filters;

- mojo::MessagePipeHandle in_process_message_pipe_handle;

+ std::string in_process_ipc_token;

std::string in_process_application_token;

private:

« no previous file with comments | « content/browser/utility_process_host_impl.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »