Merge 282206 "Visual makeover for infobars."

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java
===================================================================
--- chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java	(revision 284463)
+++ chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java	(working copy)
@@ -36,11 +36,8 @@
     public static final int ACTION_TYPE_TRANSLATE = 3;
     public static final int ACTION_TYPE_TRANSLATE_SHOW_ORIGINAL = 4;
 
-    // Background types
-    public static final int BACKGROUND_TYPE_INFO = 0;
-    public static final int BACKGROUND_TYPE_WARNING = 1;
-
     private final int mIconDrawableId;
+    private final CharSequence mMessage;
 
     private InfoBarListeners.Dismiss mListener;
     private ContentWrapperView mContentView;
@@ -66,15 +63,24 @@
     /**
      * @param listener Listens to when buttons have been clicked on the InfoBar.
      * @param iconDrawableId ID of the resource to use for the Icon.  If 0, no icon will be shown.
+     * @param message The message to show in the infobar.
      */
-    public InfoBar(InfoBarListeners.Dismiss listener, int iconDrawableId) {
+    public InfoBar(InfoBarListeners.Dismiss listener, int iconDrawableId, CharSequence message) {
         mListener = listener;
         mId = generateId();
         mIconDrawableId = iconDrawableId;
+        mMessage = message;
         mExpireOnNavigation = true;
     }
 
     /**
+     * @return The message shown in the infobar, useful for accessibility.
+     */
+    public CharSequence getMessage() {
+        return mMessage;
+    }
+
+    /**
      * Stores a pointer to the native-side counterpart of this InfoBar.
      * @param nativeInfoBarPtr Pointer to the NativeInfoBar.
      */
@@ -96,13 +102,13 @@
     }
 
     /**
-     * Determine if the infobar should be dismissed when |url| is loaded. Calling
+     * Determine if the infobar should be dismissed when a new page starts loading. Calling
      * setExpireOnNavigation(true/false) causes this method always to return true/false.
      * This only applies to java-only infobars. C++ infobars will use the same logic
      * as other platforms so they are not attempted to be dismissed twice.
      * It should really be removed once all infobars have a C++ counterpart.
      */
-    public final boolean shouldExpire(String url) {
+    public final boolean shouldExpire() {
         return mExpireOnNavigation && mNativeInfoBarPtr == 0;
     }
 
@@ -146,7 +152,10 @@
      */
     protected final View createView() {
         assert mContext != null;
-        return new InfoBarLayout(mContext, this, mIconDrawableId);
+
+        InfoBarLayout layout = new InfoBarLayout(mContext, this, mIconDrawableId, mMessage);
+        createContent(layout);
+        return layout;
     }
 
     /**
@@ -207,10 +216,16 @@
     public void setControlsEnabled(boolean state) {
         mControlsEnabled = state;
 
-        // Handle the close button.
+        // Disable all buttons on the infobar.
         if (mContentView != null) {
             View closeButton = mContentView.findViewById(R.id.infobar_close_button);
+            View primaryButton = mContentView.findViewById(R.id.button_primary);
+            View secondaryButton = mContentView.findViewById(R.id.button_secondary);
+            View tertiaryButton = mContentView.findViewById(R.id.button_tertiary);
             if (closeButton != null) closeButton.setEnabled(state);
+            if (primaryButton != null) primaryButton.setEnabled(state);
+            if (secondaryButton != null) secondaryButton.setEnabled(state);
+            if (tertiaryButton != null) tertiaryButton.setEnabled(state);
         }
     }
 
@@ -227,16 +242,6 @@
     public void createContent(InfoBarLayout layout) {
     }
 
-    @Override
-    public String getPrimaryButtonText(Context context) {
-        return null;
-    }
-
-    @Override
-    public String getSecondaryButtonText(Context context) {
-        return null;
-    }
-
     /**
      * Returns the id of the tab this infobar is showing into.
      */