content/renderer/java/gin_java_bridge_object.cc - Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame.

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/java/gin_java_bridge_object.cc

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)

Patch Set: Rebasing... Created 3 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/java/gin_java_bridge_object.cc

diff --git a/content/renderer/java/gin_java_bridge_object.cc b/content/renderer/java/gin_java_bridge_object.cc

index 95f36382a03e91ed67420e31905a89f4fd3f8e97..d747e3c0d3a6658324ffb3a43c81a75b78f4f83c 100644

--- a/content/renderer/java/gin_java_bridge_object.cc

+++ b/content/renderer/java/gin_java_bridge_object.cc

@@ -8,14 +8,14 @@

#include "content/public/renderer/render_thread.h"

#include "content/renderer/java/gin_java_function_invocation_helper.h"

#include "gin/function_template.h"

-#include "third_party/WebKit/public/web/WebFrame.h"

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

+#include "third_party/WebKit/public/web/WebLocalFrame.h"

namespace content {

// static

GinJavaBridgeObject* GinJavaBridgeObject::InjectNamed(

- blink::WebFrame* frame,

+ blink::WebLocalFrame* frame,

const base::WeakPtr<GinJavaBridgeDispatcher>& dispatcher,

const std::string& object_name,

GinJavaBridgeDispatcher::ObjectID object_id) {