From bc7c2de6a2f59d5d3b2a7d9ce0692bcf73ca089b Mon Sep 17 00:00:00 2001
From: "estade@chromium.org"
 <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 28 Sep 2010 22:57:24 +0000
Subject: [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
---
 chrome/browser/resources/options/content_settings.html | 4 ++--
 chrome/browser/resources/options/content_settings.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'chrome/browser')

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();
         }
-- 
cgit v1.1