summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorvkuzkokov <vkuzkokov@chromium.org>2015-06-19 10:58:24 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-19 18:00:12 +0000
commit92667880188d98cb0fe99f93daa2d1c38aa1ec11 (patch)
treecb6a70cebf1f64b2806a7d3e08e830abe970b806 /content
parent47615e97e76f04e213f56a1472484bf1e1542ed0 (diff)
downloadchromium_src-92667880188d98cb0fe99f93daa2d1c38aa1ec11.zip
chromium_src-92667880188d98cb0fe99f93daa2d1c38aa1ec11.tar.gz
chromium_src-92667880188d98cb0fe99f93daa2d1c38aa1ec11.tar.bz2
Fix new API warning in BrowserAccessibilityManager
BUG=502044 Review URL: https://codereview.chromium.org/1192313002 Cr-Commit-Position: refs/heads/master@{#335289}
Diffstat (limited to 'content')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java12
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java6
2 files changed, 12 insertions, 6 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
index e7f3d3c..ab0af95 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
@@ -761,12 +761,6 @@ public class BrowserAccessibilityManager {
}
@CalledByNative
- private void setAccessibilityNodeInfoViewIdResourceName(
- AccessibilityNodeInfo node, String viewIdResourceName) {
- node.setViewIdResourceName(viewIdResourceName);
- }
-
- @CalledByNative
private void setAccessibilityNodeInfoContentDescription(
AccessibilityNodeInfo node, String contentDescription, boolean annotateAsLink) {
if (annotateAsLink) {
@@ -861,6 +855,12 @@ public class BrowserAccessibilityManager {
}
@CalledByNative
+ protected void setAccessibilityNodeInfoViewIdResourceName(
+ AccessibilityNodeInfo node, String viewIdResourceName) {
+ // Requires Lollipop or higher.
+ }
+
+ @CalledByNative
private void setAccessibilityEventBooleanAttributes(AccessibilityEvent event,
boolean checked, boolean enabled, boolean password, boolean scrollable) {
event.setChecked(checked);
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
index 3e2cd58..efca3ed 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
@@ -64,6 +64,12 @@ public class LollipopBrowserAccessibilityManager extends BrowserAccessibilityMan
}
@Override
+ protected void setAccessibilityNodeInfoViewIdResourceName(
+ AccessibilityNodeInfo node, String viewIdResourceName) {
+ node.setViewIdResourceName(viewIdResourceName);
+ }
+
+ @Override
protected void setAccessibilityEventLollipopAttributes(AccessibilityEvent event,
boolean canOpenPopup,
boolean contentInvalid,