Close page info dialog before exit VR request

After the user clicks on details on the page info dialog always dismiss
the page info dialog. By doing so, the dialog disappears in VR before
showing the user the exit VR request. That is consistent with what
happens when the user clicks the site settings button.

Bug: 829043
Change-Id: Id51477f08cf693107d11044c7ca2ec477c0118f8
Reviewed-on: https://chromium-review.googlesource.com/996305
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548284}

chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java

@@ -72,7 +72,6 @@ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ssl.SecurityStateModel;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.UrlUtilities;
-import org.chromium.chrome.browser.vr_shell.OnExitVrRequestListener;
 import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.components.location.LocationUtils;
@@ -825,26 +824,16 @@ public class PageInfoPopup implements OnClickListener, ModalDialogView.Controlle
             // Expand/collapse the displayed URL title.
             mUrlTitle.toggleTruncation();
         } else if (view == mConnectionMessage) {
-            // TODO(crbug.com/819883): Port the connection info popup to VR.
-            // TODO(crbug.com/826749): Track how often users encounter this via UMA.
-            if (VrShellDelegate.isInVr()) {
-                VrShellDelegate.requestToExitVr(new OnExitVrRequestListener() {
-                    @Override
-                    public void onSucceeded() {
-                        showConnectionInfoPopup();
-                    }
-
-                    @Override
-                    public void onDenied() {}
-                });
-            } else {
-                runAfterDismiss(new Runnable() {
-                    @Override
-                    public void run() {
-                        showConnectionInfoPopup();
-                    }
-                });
-            }
+            runAfterDismiss(() -> {
+                // TODO(crbug.com/819883): Port the connection info popup to VR.
+                // TODO(crbug.com/826749): Track how often users encounter this via UMA.
+                if (VrShellDelegate.isInVr()) {
+                    VrShellDelegate.requestToExitVrAndRunOnSuccess(
+                            PageInfoPopup.this ::showConnectionInfoPopup);
+                } else {
+                    showConnectionInfoPopup();
+                }
+            });
         } else if (view.getId() == R.id.page_info_permission_row) {
             final Object intentOverride = view.getTag(R.id.permission_intent_override);
 

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

@@ -525,6 +525,18 @@ public class VrShellDelegate
         requestToExitVr(listener, UiUnsupportedMode.GENERIC_UNSUPPORTED_FEATURE);
     }
 
+    public static void requestToExitVrAndRunOnSuccess(Runnable onSuccess) {
+        requestToExitVr(new OnExitVrRequestListener() {
+            @Override
+            public void onSucceeded() {
+                onSuccess.run();
+            }
+
+            @Override
+            public void onDenied() {}
+        });
+    }
+
     public static void requestToExitVr(
             OnExitVrRequestListener listener, @UiUnsupportedMode int reason) {
         // If we're not in VR, just say that we've successfully exited VR.