content/child/mojo/mojo_application.h - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

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/mojo/mojo_application.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanup, nit Created 5 years, 10 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

« content/browser/renderer_host/render_process_host_impl.cc ('K') | « content/child/child_thread_impl.cc ('k') | content/child/mojo/mojo_application.cc » ('j') | content/common/mojo/channel_init.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/mojo/mojo_application.h

diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h

index 481c072796dd7305381ce85321553ececcce81d8..5b89ddbaa084b3d2237df856e3b53fd37e57d552 100644

--- a/content/child/mojo/mojo_application.h

+++ b/content/child/mojo/mojo_application.h

@@ -5,9 +5,9 @@

#ifndef CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_

#define CONTENT_CHILD_MOJO_MOJO_APPLICATION_H_

+#include "content/common/mojo/channel_init.h"

#include "content/common/mojo/service_registry_impl.h"

#include "ipc/ipc_platform_file.h"

-#include "third_party/mojo/src/mojo/edk/embedder/channel_init.h"

namespace IPC {

class Message;

@@ -31,7 +31,7 @@ class MojoApplication {

private:

void OnActivate(const IPC::PlatformFileForTransit& file);

- mojo::embedder::ChannelInit channel_init_;

+ ChannelInit channel_init_;

ServiceRegistryImpl service_registry_;