Fix for closing the Alert overlay.

BUG=403239
R=estade@chromium.org

Review URL: https://codereview.chromium.org/470503002

Cr-Commit-Position: refs/heads/master@{#289478}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289478 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/webui/options/certificate_manager_browsertest.js

@@ -235,8 +235,17 @@ TEST_F('CertificateManagerWebUITest',
 
   // Click on the delete button.
   $('personalCertsTab-delete').click();
+
+  // Click on the cancel button to verify the confirmation overlay closes.
+  $('alertOverlayCancel').click();
+  expectTrue($('alertOverlay').parentNode.classList.contains('transparent'));
+
+  // Click on the delete button.
+  $('personalCertsTab-delete').click();
+
   // Click on the ok button in the confirmation overlay.
   $('alertOverlayOk').click();
+  expectTrue($('alertOverlay').parentNode.classList.contains('transparent'));
 
   // Context sensitive buttons should be disabled.
   expectTrue($('personalCertsTab-view').disabled);

ui/webui/resources/js/cr/ui/page_manager/page_manager.js

@@ -536,9 +536,14 @@ cr.define('cr.ui.pageManager', function() {
       var topmostPage = null;
       for (var name in this.registeredOverlayPages) {
         var page = this.registeredOverlayPages[name];
-        if (page.visible &&
-            (!topmostPage || page.alwaysOnTop ||
-             this.getNestingLevel(page) > this.getNestingLevel(topmostPage))) {
+        if (!page.visible)
+          continue;
+
+        if (page.alwaysOnTop)
+          return page;
+
+        if (!topmostPage ||
+             this.getNestingLevel(page) > this.getNestingLevel(topmostPage)) {
           topmostPage = page;
         }
       }