content/renderer/render_frame_impl.cc - Issue 353163002: [Android] Switch to Gin Java Bridge implementation

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 353163002: [Android] Switch to Gin Java Bridge implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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/renderer/render_frame_impl.cc

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

index 92e7367871040aa18c6a4c27ab77a3ff6f68fbff..88fb0b7d1fe9dc02c2b28793a81d31656246754d 100644

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

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

@@ -59,7 +59,7 @@

#include "content/renderer/image_loading_helper.h"

#include "content/renderer/ime_event_guard.h"

#include "content/renderer/internal_document_state_data.h"

-#include "content/renderer/java/java_bridge_dispatcher.h"

+#include "content/renderer/java/gin_java_bridge_dispatcher.h"

jamesr 2014/06/30 19:17:52 why isn't this in the OS_ANDROID block?

mnaganov (inactive) 2014/07/01 12:38:09 Done.

#include "content/renderer/media/audio_renderer_mixer_manager.h"

#include "content/renderer/media/media_stream_dispatcher.h"

#include "content/renderer/media/media_stream_impl.h"

@@ -417,7 +417,7 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)

render_view_->RegisterRenderFrame(this);

#if defined(OS_ANDROID)

- new JavaBridgeDispatcher(this);

+ new GinJavaBridgeDispatcher(this);

#endif

#if defined(ENABLE_NOTIFICATIONS)

« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java ('k') | no next file » | no next file with comments »