Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

Issue 10830173: JavaBridge should use Annotation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comment based on nit. Created 8 years, 4 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/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
index 9127ae4edd22120c434645c92266e52a62869b53..f5324a8a6195389b46069ca2b46eda4632e5198f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
@@ -18,6 +18,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.JavascriptInterface;
import org.json.JSONException;
import org.json.JSONObject;
@@ -239,13 +240,13 @@ public class AccessibilityInjector {
if (mTextToSpeech == null) {
mTextToSpeech = new TextToSpeechWrapper(context);
mContentViewCore.addJavascriptInterface(mTextToSpeech,
- ALIAS_ACCESSIBILITY_JS_INTERFACE, false);
+ ALIAS_ACCESSIBILITY_JS_INTERFACE, true);
}
if (mVibrator == null) {
mVibrator = new VibratorWrapper(context);
mContentViewCore.addJavascriptInterface(mVibrator,
- ALIAS_ACCESSIBILITY_JS_INTERFACE_2, false);
+ ALIAS_ACCESSIBILITY_JS_INTERFACE_2, true);
}
}
}
@@ -314,17 +315,20 @@ public class AccessibilityInjector {
mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public boolean hasVibrator() {
return mVibrator.hasVibrator();
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public void vibrate(long milliseconds) {
milliseconds = Math.min(milliseconds, MAX_VIBRATE_DURATION_MS);
mVibrator.vibrate(milliseconds);
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public void vibrate(long[] pattern, int repeat) {
for (int i = 0; i < pattern.length; ++i) {
@@ -336,6 +340,7 @@ public class AccessibilityInjector {
mVibrator.vibrate(pattern, repeat);
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public void cancel() {
mVibrator.cancel();
@@ -352,16 +357,19 @@ public class AccessibilityInjector {
mTextToSpeech = new TextToSpeech(context, null, null);
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public boolean isSpeaking() {
return mTextToSpeech.isSpeaking();
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public int speak(String text, int queueMode, HashMap<String, String> params) {
return mTextToSpeech.speak(text, queueMode, params);
}
+ @JavascriptInterface
@SuppressWarnings("unused")
public int stop() {
return mTextToSpeech.stop();

Powered by Google App Engine
This is Rietveld 408576698