diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 22:57:24 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 22:57:24 +0000 |
| commit | bc7c2de6a2f59d5d3b2a7d9ce0692bcf73ca089b (patch) | |
| tree | 603f574be1c15620a0d79d2d060915085dca2078 /chrome/browser | |
| parent | 585e89462a7a8e3dca63a427338a060b0e4634db (diff) | |
| download | chromium_src-bc7c2de6a2f59d5d3b2a7d9ce0692bcf73ca089b.zip chromium_src-bc7c2de6a2f59d5d3b2a7d9ce0692bcf73ca089b.tar.gz chromium_src-bc7c2de6a2f59d5d3b2a7d9ce0692bcf73ca089b.tar.bz2 | |
[domui settings] Unbreak geolocation/notifications exceptions list.
BUG=none
TEST=clicking the exceptions links for those two tabs works again
Review URL: http://codereview.chromium.org/3517002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/resources/options/content_settings.html | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/options/content_settings.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html index 49cc3ab..5f4673a 100644 --- a/chrome/browser/resources/options/content_settings.html +++ b/chrome/browser/resources/options/content_settings.html @@ -223,7 +223,7 @@ </table> <div class="exceptionsLink" i18n-content="content_exceptions"></div> - <div contentType="location"> + <div contentType="location" mode="normal"> <list></list> </div> </div> @@ -253,7 +253,7 @@ </table> <div class="exceptionsLink" i18n-content="content_exceptions"></div> - <div contentType="notifications"> + <div contentType="notifications" mode="normal"> <list></list> </div> </div> diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js index c9991b8..35676c9 100644 --- a/chrome/browser/resources/options/content_settings.js +++ b/chrome/browser/resources/options/content_settings.js @@ -38,7 +38,7 @@ cr.define('options', function() { var otrExceptionsArea = event.target.parentNode. querySelector('div[contentType][mode=otr]'); - if (otrExceptionsArea.otrProfileExists) { + if (otrExceptionsArea && otrExceptionsArea.otrProfileExists) { otrExceptionsArea.classList.toggle('hidden'); otrExceptionsArea.querySelector('list').redraw(); } |