content/public/android/java/src/org/chromium/content/browser/ContentView.java - Issue 11788005: Switch Android code to use ExecuteJavascriptInWebFrameCallbackResult.

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/public/android/java/src/org/chromium/content/browser/ContentView.java

Issue 11788005: Switch Android code to use ExecuteJavascriptInWebFrameCallbackResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tweaks Created 7 years, 11 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

« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java

index 0715656da8833252bd530361b5ccd668e837945e..eebd79b6237667c02cfe71ee003cdd594cd6eb7e 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java

@@ -416,17 +416,11 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal

/**

* Injects the passed JavaScript code in the current page and evaluates it.

- * Once evaluated, an asynchronous call to

- * ContentViewClient.onJavaScriptEvaluationResult is made. Used in automation

- * tests.

- * @return an id that is passed along in the asynchronous onJavaScriptEvaluationResult callback

* @throws IllegalStateException If the ContentView has been destroyed.

- *

- * TODO(nileshagrawal): Remove this method from the public interface.

- public int evaluateJavaScript(String script) throws IllegalStateException {

- return mContentViewCore.evaluateJavaScript(script);

+ public void evaluateJavaScript(String script) throws IllegalStateException {

+ mContentViewCore.evaluateJavaScript(script, null);

}

/**