Permissions: Add new Infobar to support grouped permission requests on Android

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarControlLayout.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.infobar;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Paint;
 import android.support.v7.widget.SwitchCompat;
@@ skipping 256 matching lines @@
      * Adds an icon with a descriptive message to the layout.
      *
      * -----------------------------------------------------
      * | ICON | PRIMARY MESSAGE SECONDARY MESSAGE          |
      * -----------------------------------------------------
      * If an icon is not provided, the ImageView that would normally show it is hidden.
      *
      * @param iconResourceId   ID of the drawable to use for the icon.
      * @param primaryMessage   Message to display for the toggle.
      * @param secondaryMessage Additional descriptive text for the toggle.  May be null.
+     * @param iconColorId      ID of the tint color for the icon, or 0 for default.
      */
-    public View addIcon(
-            int iconResourceId, CharSequence primaryMessage, CharSequence secondaryMessage) {
+    public View addIcon(int iconResourceId, CharSequence primaryMessage,
+            CharSequence secondaryMessage, int iconColorId) {
         LinearLayout layout = (LinearLayout) LayoutInflater.from(getContext()).inflate(
                 R.layout.infobar_control_icon_with_description, this, false);
         addView(layout, new ControlLayoutParams());
 
         ImageView iconView = (ImageView) layout.findViewById(R.id.control_icon);
         iconView.setImageResource(iconResourceId);
+        if (iconColorId != 0) {
+            iconView.setColorFilter(ApiCompatibilityUtils.getColor(getResources(), iconColorId));
+        }
 
         // The primary message text is always displayed.
         TextView primaryView = (TextView) layout.findViewById(R.id.control_message);
         primaryView.setText(primaryMessage);
 
         // The secondary message text is optional.
         TextView secondaryView =
                 (TextView) layout.findViewById(R.id.control_secondary_message);
         if (secondaryMessage == null) {
             layout.removeView(secondaryView);
@@ skipping 105 matching lines @@
 
     /**
      * @return The {@link ControlLayoutParams} for the given child.
      */
     @VisibleForTesting
     static ControlLayoutParams getControlLayoutParams(View child) {
         return (ControlLayoutParams) child.getLayoutParams();
     }
 
 }