Fix accessibility issues in custom tab UI

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 6809b1662288e65abbe6691d8ed68e6b56731cd4..4814fec13d2dcde957beaeb273963af3021b9db1 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
@@ -55,7 +55,8 @@ import org.chromium.ui.base.WindowAndroid;
 /**
  * The Toolbar layout to be used for a custom tab. This is used for both phone and tablet UIs.
  */
-public class CustomTabToolbar extends ToolbarLayout implements LocationBar {
+public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
+        View.OnLongClickListener {
     private View mUrlInfoContainer;
     private UrlBar mUrlBar;
     private TextView mTitleBar;
@@ -92,6 +93,9 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar {
         mSecurityButtonShowAnimator = ObjectAnimator.ofFloat(mSecurityButton, ALPHA, 1);
         mSecurityButtonShowAnimator
                 .setDuration(ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS);
+
+        mReturnButton.setOnLongClickListener(this);
+        mCustomActionButton.setOnLongClickListener(this);
     }
 
     @Override
@@ -461,6 +465,19 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar {
         super.onLayout(changed, left, top, right, bottom);
     }
 
+    @Override
+    public boolean onLongClick(View v) {
+        int stringResourceId = 0;
+        if (v == mReturnButton) {
+            stringResourceId = R.string.accessibility_toolbar_btn_back;
+        } else if (v == mCustomActionButton) {
+            stringResourceId = R.string.accessibility_toolbar_btn_custom;
+        } else {
+            return false;
+        }
+        return showAccessibilityToast(v, stringResourceId);
+    }
+
     // Toolbar and LocationBar calls that are not relevant here.
 
     @Override