Hide modal permission prompts on Android upon tab navigation/destruction

chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogDelegate.java

 // Copyright 2016 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.permissions;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
  * Delegate class for modal permission dialogs. Contains all of the data displayed in a prompt,
  * including the button strings, message text, link text, the icon, and whether or not to display
  * a persistence toggle.
  *
  * This class is also the interface to the native-side permissions code. When the user responds to
  * the permission dialog, the decision is conveyed across the JNI so that the native code can
  * respond appropriately.
  */
 public class PermissionDialogDelegate {
     /** The native-side counterpart of this class */
     private long mNativeDelegatePtr;
 
+    /** The controller for this class */
+    private PermissionDialogController mDialogController;
+
     /** The tab for which to create the dialog. */
     private Tab mTab;
 
     /** The icon to display in the dialog. */
     private int mDrawableId;
 
     /** Text shown in the dialog. */
     private String mMessageText;
 
     /** Text shown on the link, e.g. "Learn more". */
@@ skipping 62 matching lines @@
         assert mNativeDelegatePtr != 0;
         nativeDestroy(mNativeDelegatePtr);
         mNativeDelegatePtr = 0;
     }
 
     public void onLinkClicked() {
         assert mNativeDelegatePtr != 0;
         nativeLinkClicked(mNativeDelegatePtr);
     }
 
+    public void setDialogController(PermissionDialogController controller) {
+        assert mDialogController == null;

[dominickn, 2017/05/24 03:33:38]

I don't think this assert is needed.

[Timothy Loh, 2017/05/24 04:59:33]

OK, removed

+        mDialogController = controller;
+    }
+
+    /**
+     * Called from C++ by |nativeDelegatePtr| to destroy the dialog.
+     */
+    @CalledByNative
+    private void destroyFromNative() {

[dominickn, 2017/05/24 03:33:38]

dismissFromNative

[Timothy Loh, 2017/05/24 04:59:33]

Done.

+        assert mNativeDelegatePtr != 0;
+        mNativeDelegatePtr = 0;
+        mDialogController.destroyFromNative(this);
+    }
+
     /**
      * Called from C++ by |nativeDelegatePtr| to instantiate this class.
      *
      * @param nativeDelegatePtr     The native counterpart that this object owns.
      * @param tab                   The tab to create the dialog for.
      * @param contentSettingsTypes  The content settings types requested by this dialog.
      * @param iconResourceId        The id of the icon to display in the dialog.
      * @param message               The message to display in the dialog.
      * @param linkText              The text to display in the link (if any).
      * @param primaryTextButton     The text to display on the primary button.
@@ skipping 25 matching lines @@
         mSecondaryButtonText = secondaryButtonText;
         mShowPersistenceToggle = showPersistenceToggle;
     }
 
     private native void nativeAccept(long nativePermissionDialogDelegate, boolean persist);
     private native void nativeCancel(long nativePermissionDialogDelegate, boolean persist);
     private native void nativeDismissed(long nativePermissionDialogDelegate);
     private native void nativeLinkClicked(long nativePermissionDialogDelegate);
     private native void nativeDestroy(long nativePermissionDialogDelegate);
 }