summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 23:54:42 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 23:54:42 +0000
commitfe2c5f5de80f2c33cb3e2c6cfda754f7aba733b9 (patch)
tree807bde5bcec43de45a8aaa8ee8ba9424d9989b1e /content/public
parent19657825eeef4f252914b1e4308ed5c14bd5a2c5 (diff)
downloadchromium_src-fe2c5f5de80f2c33cb3e2c6cfda754f7aba733b9.zip
chromium_src-fe2c5f5de80f2c33cb3e2c6cfda754f7aba733b9.tar.gz
chromium_src-fe2c5f5de80f2c33cb3e2c6cfda754f7aba733b9.tar.bz2
Temporary fix for downstream webview
Add back the missing API, until we switch to using the new one. BUG= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index a671d0b..ec22ebd 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -2094,6 +2094,13 @@ public class ContentViewCore implements MotionEventDelegate {
return mZoomManager.getZoomControlsViewForTest();
}
+ // TODO(joth): Remove in next patch.
+ @Deprecated
+ public void addJavascriptInterface(Object object, String name, boolean requireAnnotation) {
+ addPossiblyUnsafeJavascriptInterface(object, name,
+ requireAnnotation ? JavascriptInterface.class : null);
+ }
+
/**
* This will mimic {@link #addPossiblyUnsafeJavascriptInterface(Object, String, Class)}
* and automatically pass in {@link JavascriptInterface} as the required annotation.