Let client specify content description for custom action button

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.toolbar;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ skipping 208 matching lines @@
                     (ViewGroup) getRootView().findViewById(R.id.control_container);
             int progressBarPosition = UiUtils.insertAfter(
                     controlContainer, mProgressBar, (View) getParent());
             assert progressBarPosition >= 0;
         }
     }
 
     /**
      * Shows the content description toast for items on the toolbar.
      * @param view The view to anchor the toast.
-     * @param stringResId The resource id for the string in the toast.
+     * @param description The string shown in the toast.
      * @return Whether a toast has been shown successfully.
      */
-    protected boolean showAccessibilityToast(View view, int stringResId) {
-        if (stringResId == 0) return false;
+    protected boolean showAccessibilityToast(View view, CharSequence description) {
+        if (description == null) return false;
 
         final int screenWidth = getResources().getDisplayMetrics().widthPixels;
         final int[] screenPos = new int[2];
         view.getLocationOnScreen(screenPos);
         final int width = view.getWidth();
 
-        Toast toast = Toast.makeText(
-                getContext(), getResources().getString(stringResId), Toast.LENGTH_SHORT);
+        Toast toast = Toast.makeText(getContext(), description, Toast.LENGTH_SHORT);
         toast.setGravity(
                 Gravity.TOP | Gravity.END,
                 screenWidth - screenPos[0] - width / 2,
                 getHeight());
         toast.show();
         return true;
     }
 
     /**
      * @return The provider for toolbar related data.
@@ skipping 126 matching lines @@
      */
     protected void onPrimaryColorChanged() { }
 
     /**
      * Sets the icon drawable that the close button in the toolbar (if any) should show.
      */
     public void setCloseButtonImageResource(Drawable drawable) { }
 
     /**
      * Adds a custom action button to the {@link ToolbarLayout} if it is supported.
+     * @param description  The content description for the button.
+     * @param listener     The {@link OnClickListener} to use for clicks to the button.
      * @param buttonSource The {@link Bitmap} resource to use as the source for the button.
-     * @param listener The {@link OnClickListener} to use for clicks to the button.
      */
-    public void addCustomActionButton(Drawable drawable, OnClickListener listener) { }
+    public void addCustomActionButton(Drawable drawable, String description,
+            OnClickListener listener) { }
 
     /**
      * Triggered when the content view for the specified tab has changed.
      */
     protected void onTabContentViewChanged() {
         NewTabPage ntp = getToolbarDataProvider().getNewTabPageForCurrentTab();
         if (ntp != null) getLocationBar().onTabLoadingNTP(ntp);
     }
 
     @Override
@@ skipping 184 matching lines @@
     }
 
     /**
      * Opens hompage in the current tab.
      */
     protected void openHomepage() {
         getLocationBar().hideSuggestions();
         if (mToolbarTabController != null) mToolbarTabController.openHomepage();
     }
 }