summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 20:35:12 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 20:35:12 +0000
commitf38c37a754b2043b7567a63694273c059b46eeed (patch)
treea44ea57a34474b61585e05328288345786613d83
parentd0c1cebac9d2fd2e59bbeb986b597693a250c4c3 (diff)
downloadchromium_src-f38c37a754b2043b7567a63694273c059b46eeed.zip
chromium_src-f38c37a754b2043b7567a63694273c059b46eeed.tar.gz
chromium_src-f38c37a754b2043b7567a63694273c059b46eeed.tar.bz2
Fix overlay display in certificate options.
When we try to delete a certificate, the overlay that is shown doesn't have a parent set; which causes an exception in the show overlay javascipt. Fix this so the delete button works again. R=csilv@chromium.org BUG=130396 TEST=Tested that a certificate was deleted when the delete button was pressed and the OK option selected. Review URL: https://chromiumcodereview.appspot.com/10680010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144536 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options2/options_page.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/resources/options2/options_page.js b/chrome/browser/resources/options2/options_page.js
index c42cac4..eead8a7 100644
--- a/chrome/browser/resources/options2/options_page.js
+++ b/chrome/browser/resources/options2/options_page.js
@@ -779,9 +779,11 @@ cr.define('options', function() {
if (visible) {
uber.invokeMethodOnParent('beginInterceptingEvents');
this.pageDiv.removeAttribute('aria-hidden');
- this.parentPage.pageDiv.setAttribute('aria-hidden', true);
+ if (this.parentPage)
+ this.parentPage.pageDiv.setAttribute('aria-hidden', true);
} else {
- this.parentPage.pageDiv.removeAttribute('aria-hidden');
+ if (this.parentPage)
+ this.parentPage.pageDiv.removeAttribute('aria-hidden');
}
if (container.hidden != visible) {