diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 22:10:21 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 22:10:21 +0000 |
| commit | 94993ce7782b5e9c9a9d67bb33fe7c551c6ded32 (patch) | |
| tree | d3bdb3c80e31977981f3fe5365fc0e1a18c4d0e5 | |
| parent | 920d1a18e76f65ee82f88082289e06ce5be72e6f (diff) | |
| download | chromium_src-94993ce7782b5e9c9a9d67bb33fe7c551c6ded32.zip chromium_src-94993ce7782b5e9c9a9d67bb33fe7c551c6ded32.tar.gz chromium_src-94993ce7782b5e9c9a9d67bb33fe7c551c6ded32.tar.bz2 | |
Merge 144536 - 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
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830075
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@149046 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options2/options_page.js | 6 |
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 7bb67f0..8871b5e 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) { |