Let client specify content description for custom action button

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index da64afcd5630198dc916dcc899a9a59a4ed9ae0c..d17381d1bcb4cdcb1a15eb4f3459fa8c7082b71b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -132,7 +132,8 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     }
 
     @Override
-    public void addCustomActionButton(Drawable drawable, OnClickListener listener) {
+    public void addCustomActionButton(Drawable drawable, String description,
+            OnClickListener listener) {
         Resources resources = getResources();
 
         // The height will be scaled to match spec while keeping the aspect ratio, so get the scaled
@@ -149,6 +150,7 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         mCustomActionButton.setPadding(sidePadding, topPadding, sidePadding, bottomPadding);
         mCustomActionButton.setImageDrawable(drawable);
 
+        mCustomActionButton.setContentDescription(description);
         mCustomActionButton.setOnClickListener(listener);
         mCustomActionButton.setVisibility(VISIBLE);
     }
@@ -451,15 +453,15 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
 
     @Override
     public boolean onLongClick(View v) {
-        int stringResourceId = 0;
+        CharSequence description = null;
         if (v == mCloseButton) {
-            stringResourceId = R.string.close_tab;
+            description = getResources().getString(R.string.close_tab);
         } else if (v == mCustomActionButton) {
-            stringResourceId = R.string.accessibility_toolbar_btn_custom;
+            description = mCustomActionButton.getContentDescription();
         } else {
             return false;
         }
-        return showAccessibilityToast(v, stringResourceId);
+        return showAccessibilityToast(v, description);
     }
 
     // Toolbar and LocationBar calls that are not relevant here.