content/renderer/render_frame_impl.cc - 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/renderer/render_frame_impl.cc

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: 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/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index eda764382968862dc1c968cbffb2679c979520a4..0f43da2b1ae42e6578d84dcc3ce0b7d2ba25feab 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -148,8 +148,6 @@

#include "third_party/WebKit/public/web/WebSurroundingText.h"

#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"

#include "third_party/WebKit/public/web/WebView.h"

-#include "third_party/mojo/src/mojo/edk/js/core.h"

-#include "third_party/mojo/src/mojo/edk/js/support.h"

#include "url/url_util.h"

#if defined(ENABLE_PLUGINS)

@@ -199,6 +197,14 @@

#include "content/renderer/vr/vr_dispatcher.h"

#endif

+#if defined(USE_CHROME_EDK)

+#include "mojo/edk/js/core.h"

+#include "mojo/edk/js/support.h"

+#else

+#include "third_party/mojo/src/mojo/edk/js/core.h"

+#include "third_party/mojo/src/mojo/edk/js/support.h"

+#endif

using blink::WebContentDecryptionModule;

using blink::WebContextMenuData;

using blink::WebData;

« base/win/object_watcher.h ('K') | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/BUILD.gn » ('j') | mojo/edk/system/message_pipe_dispatcher.cc » ('J')