content/browser/mojo/mojo_application_host.h - Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

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

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move to mojo::edk namespace in preparation for runtim flag Created 5 years, 3 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/browser/mojo/mojo_application_host.h

diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h

index fffb59e05c63395ee3e666f4eb4faa249cf7d49c..ebd032e12dbab8411c52980ab4b4ff500c9b0d97 100644

--- a/content/browser/mojo/mojo_application_host.h

+++ b/content/browser/mojo/mojo_application_host.h

@@ -10,7 +10,12 @@

#include "content/common/application_setup.mojom.h"

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

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

+#if defined(USE_CHROME_EDK)

+#include "mojo/edk/embedder/scoped_platform_handle.h"

+#else

#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"

+#endif

#if defined(OS_ANDROID)

#include "content/browser/mojo/service_registry_android.h"

@@ -56,7 +61,11 @@ class CONTENT_EXPORT MojoApplicationHost {

private:

ChannelInit channel_init_;

+#if defined(USE_CHROME_EDK)

+ mojo::edk::ScopedPlatformHandle client_handle_;

+#else

mojo::embedder::ScopedPlatformHandle client_handle_;

+#endif

bool did_activate_;

« chrome/browser/BUILD.gn ('K') | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/mojo/mojo_application_host.cc » ('j') | mojo/edk/js/test/BUILD.gn » ('J')