Remove the permission toggles from grouped permission infobars on Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
index 0cb4dd0be5189ab47093b5547097de56ddbe848c..c55a11490fa0b155bce484fc119fd560edc2c0ec 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.java
@@ -4,22 +4,17 @@
 
 package org.chromium.chrome.browser.infobar;
 
-import android.support.v7.widget.SwitchCompat;
-
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.tab.Tab;
 
-import java.util.ArrayList;
-
 /**
  * An infobar for showing several permission requests which can be allowed or blocked.
  */
 public class GroupedPermissionInfoBar extends PermissionInfoBar {
     private final String[] mPermissionText;
     private final int[] mPermissionIcons;
-    private long mNativeGroupedPermissionInfoBar;
 
     GroupedPermissionInfoBar(Tab tab, int[] contentSettingsTypes, String message, String buttonOk,
             String buttonCancel, boolean showPersistenceToggle, String[] permissionText,
@@ -34,53 +29,17 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar {
     public void createContent(InfoBarLayout layout) {
         InfoBarControlLayout control = layout.addControlLayout();
 
-        if (mPermissionIcons.length == 1) {
+        for (int i = 0; i < mPermissionIcons.length; i++) {
             control.addIcon(ResourceId.mapToDrawableId(mPermissionIcons[0]),
-                    R.color.light_normal_color, mPermissionText[0], null);
-        } else {
-            for (int i = 0; i < mPermissionIcons.length; i++) {
-                control.addSwitch(ResourceId.mapToDrawableId(mPermissionIcons[i]),
-                        R.color.light_normal_color, mPermissionText[i], i, true);
-            }
+                    R.color.light_normal_color, mPermissionText[i], null);
         }
 
+        // TODO(raymes): Ensure the ALLOW/BLOCK buttons are shown.
+
         // Call this last to ensure that if a persistence toggle is added, it's added last.
         super.createContent(layout);
     }
 
-    @Override
-    public void onButtonClicked(final boolean isPrimaryButton) {
-        if (isPrimaryButton) {
-            boolean[] toggleStatus = new boolean[mPermissionIcons.length];
-
-            if (mPermissionIcons.length == 1) {
-                toggleStatus[0] = true;
-            } else {
-                for (int i = 0; i < mPermissionIcons.length; i++) {
-                    toggleStatus[i] = ((SwitchCompat) getView().findViewById(i)).isChecked();
-                }
-            }
-
-            // Only request the permissions which were actually allowed by the user.
-            ArrayList<Integer> selectedContentSettingsTypes = new ArrayList<Integer>();
-            for (int i = 0; i < toggleStatus.length; i++) {
-                if (toggleStatus[i]) {
-                    selectedContentSettingsTypes.add(Integer.valueOf(mContentSettingsTypes[i]));
-                }
-            }
-            int[] selectedArray = new int[selectedContentSettingsTypes.size()];
-            for (int i = 0; i < selectedContentSettingsTypes.size(); i++) {
-                selectedArray[i] = selectedContentSettingsTypes.get(i).intValue();
-            }
-
-            if (mNativeGroupedPermissionInfoBar != 0) {
-                nativeSetPermissionState(mNativeGroupedPermissionInfoBar, toggleStatus);
-                mContentSettingsTypes = selectedArray;
-            }
-        }
-        super.onButtonClicked(isPrimaryButton);
-    }
-
     @Override
     @CalledByNative
     protected boolean isPersistSwitchOn() {
@@ -110,18 +69,4 @@ public class GroupedPermissionInfoBar extends PermissionInfoBar {
                         buttonCancel, showPersistenceToggle, permissionText, permissionIcons);
         return infobar;
     }
-
-    @CalledByNative
-    private void setNativePtr(long nativePtr) {
-        mNativeGroupedPermissionInfoBar = nativePtr;
-    }
-
-    @Override
-    protected void onNativeDestroyed() {
-        mNativeGroupedPermissionInfoBar = 0;
-        super.onNativeDestroyed();
-    }
-
-    private native void nativeSetPermissionState(
-            long nativeGroupedPermissionInfoBar, boolean[] permissions);
 }