Expose accessible descriptions on Android.

content/browser/accessibility/browser_accessibility_manager_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 386 matching lines @@
       node->IsClickable(),
       node->IsEditableText(),
       node->IsEnabled(),
       node->IsFocusable(),
       node->IsFocused());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoClassName(
       env, obj, info,
       base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
   if (!node->IsPassword() ||
       Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
-    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoContentDescription(
+    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoText(
         env, obj, info,
         base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
-        node->IsLink());
+        node->IsLink(),
+        node->IsEditableText());
   }
   base::string16 element_id;
   if (node->GetHtmlAttribute("id", &element_id)) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoViewIdResourceName(
         env, obj, info,
         base::android::ConvertUTF16ToJavaString(env, element_id).obj());
   }
 
   gfx::Rect absolute_rect = node->GetLocalBoundsRect();
   gfx::Rect parent_relative_rect = absolute_rect;
@@ skipping 16 matching lines @@
       base::android::ConvertUTF16ToJavaString(
           env, node->GetRoleDescription()).obj());
 
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLollipopAttributes(
       env, obj, info,
       node->CanOpenPopup(),
       node->IsContentInvalid(),
       node->IsDismissable(),
       node->IsMultiLine(),
       node->AndroidInputType(),
-      node->AndroidLiveRegionType());
+      node->AndroidLiveRegionType(),
+      base::android::ConvertUTF16ToJavaString(
+          env, node->GetDescription()).obj());
   if (node->IsCollection()) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoCollectionInfo(
         env, obj, info,
         node->RowCount(),
         node->ColumnCount(),
         node->IsHierarchical());
   }
   if (node->IsCollectionItem() || node->IsHeading()) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoCollectionItemInfo(
         env, obj, info,
@@ skipping 484 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content