Allow modal permission prompts on Android to request system permissions.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
index bb5880d610d1dee826d058064ae5e5b324c612f1..7db788b773f85b88b058b2cd35ab77d8ad4f9163 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java
@@ -4,42 +4,27 @@
 
 package org.chromium.chrome.browser.infobar;
 
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SwitchCompat;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.TextView;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ContentSettingsType;
 import org.chromium.chrome.browser.ResourceId;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.chrome.browser.permissions.AndroidPermissionRequester;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.ui.base.WindowAndroid;
-import org.chromium.ui.base.WindowAndroid.PermissionCallback;
 
 /**
  * An infobar used for prompting the user to grant a web API permission.
  *
  */
-public class PermissionInfoBar extends ConfirmInfoBar {
+public class PermissionInfoBar
+        extends ConfirmInfoBar implements AndroidPermissionRequester.RequestDelegate {
 
     /** Whether or not to show a toggle for opting out of persisting the decision. */
     private boolean mShowPersistenceToggle;
 
-    private WindowAndroid mWindowAndroid;
-
-    /**
-     * Mapping between the required {@link ContentSettingsType}s and their associated Android
-     * runtime permissions.  Only {@link ContentSettingsType}s that are associated with runtime
-     * permissions will be included in this list while all others will be excluded.
-     */
-    private SparseArray<String> mContentSettingsToPermissionsMap;
+    private AndroidPermissionRequester mRequester;
 
     protected PermissionInfoBar(int iconDrawableId, Bitmap iconBitmap, String message,
             String linkText, String primaryButtonText, String secondaryButtonText,
@@ -64,7 +49,19 @@ public class PermissionInfoBar extends ConfirmInfoBar {
 
     @Override
     public void onTabReparented(Tab tab) {
-        mWindowAndroid = tab.getWindowAndroid();
+        if (mRequester != null) {
+            mRequester.setWindowAndroid(tab.getWindowAndroid());
+        }
+    }
+
+    @Override
+    public void onAndroidPermissionAccepted() {
+        onButtonClickedInternal(true);
+    }
+
+    @Override
+    public void onAndroidPermissionCanceled() {
+        onCloseButtonClicked();
     }
 
     /**
@@ -75,122 +72,21 @@ public class PermissionInfoBar extends ConfirmInfoBar {
      * @param contentSettings The list of {@link ContentSettingsType}s whose access is guarded
      *                        by this InfoBar.
      */
-    protected void setContentSettings(
-            WindowAndroid windowAndroid, int[] contentSettings) {
-        mWindowAndroid = windowAndroid;
+    protected void setContentSettings(WindowAndroid windowAndroid, int[] contentSettings) {
         assert windowAndroid != null
                 : "A WindowAndroid must be specified to request access to content settings";
 
-        mContentSettingsToPermissionsMap = generatePermissionsMapping(contentSettings);
-    }
-
-    private SparseArray<String> generatePermissionsMapping(int[] contentSettings) {
-        SparseArray<String> permissionsToRequest = new SparseArray<String>();
-        for (int i = 0; i < contentSettings.length; i++) {
-            String permission = PrefServiceBridge.getAndroidPermissionForContentSetting(
-                    contentSettings[i]);
-            if (permission != null && !mWindowAndroid.hasPermission(permission)) {
-                permissionsToRequest.append(contentSettings[i], permission);
-            }
-        }
-        return permissionsToRequest;
-    }
-
-    private int getDeniedPermissionResourceId(String permission) {
-        int contentSettingsType = 0;
-        // SparseArray#indexOfValue uses == instead of .equals, so we need to manually iterate
-        // over the list.
-        for (int i = 0; i < mContentSettingsToPermissionsMap.size(); i++) {
-            if (permission.equals(mContentSettingsToPermissionsMap.valueAt(i))) {
-                contentSettingsType = mContentSettingsToPermissionsMap.keyAt(i);
-            }
-        }
-
-        if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-            return R.string.infobar_missing_location_permission_text;
-        }
-        if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-            return R.string.infobar_missing_microphone_permission_text;
-        }
-        if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
-            return R.string.infobar_missing_camera_permission_text;
-        }
-        assert false : "Unexpected content setting type received: " + contentSettingsType;
-        return R.string.infobar_missing_multiple_permissions_text;
+        mRequester = new AndroidPermissionRequester(windowAndroid, this, contentSettings);
     }
 
     @Override
     public void onButtonClicked(final boolean isPrimaryButton) {
-        if (mWindowAndroid == null || !isPrimaryButton || getContext() == null
-                || mContentSettingsToPermissionsMap == null
-                || mContentSettingsToPermissionsMap.size() == 0) {
+        if (!isPrimaryButton || getContext() == null || mRequester.shouldSkipPermissionRequest()) {
             onButtonClickedInternal(isPrimaryButton);
             return;
         }
 
-        requestAndroidPermissions();
-    }
-
-    private void requestAndroidPermissions() {
-        PermissionCallback callback = new PermissionCallback() {
-            @Override
-            public void onRequestPermissionsResult(
-                    String[] permissions, int[] grantResults) {
-                int deniedCount = 0;
-                int requestableCount = 0;
-                int deniedStringId = R.string.infobar_missing_multiple_permissions_text;
-                for (int i = 0; i < grantResults.length; i++) {
-                    if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
-                        deniedCount++;
-                        if (deniedCount > 1) {
-                            deniedStringId = R.string.infobar_missing_multiple_permissions_text;
-                        } else {
-                            deniedStringId = getDeniedPermissionResourceId(permissions[i]);
-                        }
-
-                        if (mWindowAndroid.canRequestPermission(permissions[i])) {
-                            requestableCount++;
-                        }
-                    }
-                }
-
-                Activity activity = mWindowAndroid.getActivity().get();
-                if (deniedCount > 0 && requestableCount > 0 && activity != null) {
-                    View view = activity.getLayoutInflater().inflate(
-                            R.layout.update_permissions_dialog, null);
-                    TextView dialogText = (TextView) view.findViewById(R.id.text);
-                    dialogText.setText(deniedStringId);
-
-                    AlertDialog.Builder builder =
-                            new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
-                            .setView(view)
-                            .setPositiveButton(R.string.infobar_update_permissions_button_text,
-                                    new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int id) {
-                                            requestAndroidPermissions();
-                                        }
-                                    })
-                             .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                                     @Override
-                                     public void onCancel(DialogInterface dialog) {
-                                         onCloseButtonClicked();
-                                     }
-                             });
-                    builder.create().show();
-                } else if (deniedCount > 0) {
-                    onCloseButtonClicked();
-                } else {
-                    onButtonClickedInternal(true);
-                }
-            }
-        };
-
-        String[] permissionsToRequest = new String[mContentSettingsToPermissionsMap.size()];
-        for (int i = 0; i < mContentSettingsToPermissionsMap.size(); i++) {
-            permissionsToRequest[i] = mContentSettingsToPermissionsMap.valueAt(i);
-        }
-        mWindowAndroid.requestPermissions(permissionsToRequest, callback);
+        mRequester.requestAndroidPermissions();
     }
 
     private void onButtonClickedInternal(boolean isPrimaryButton) {