Don't display the default content settings (wildcard patterns) in the eptions lists.

BUG=103734
TEST=Wildcard patterns not in exceptions list.


Review URL: http://codereview.chromium.org/8486002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110290 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -481,6 +481,12 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
            all_settings.begin();
        i != all_settings.end();
        ++i) {
+    // Don't add default settings.
+    if (i->primary_pattern == ContentSettingsPattern::Wildcard() &&
+        i->secondary_pattern == ContentSettingsPattern::Wildcard() &&
+        i->source != "preferences") {
+      continue;
+    }
     all_patterns_settings[i->primary_pattern][i->secondary_pattern] =
         i->setting;
   }
@@ -538,6 +544,13 @@ void ContentSettingsHandler::UpdateNotificationExceptionsView() {
            settings.begin();
        i != settings.end();
        ++i) {
+    // Don't add default settings.
+    if (i->primary_pattern == ContentSettingsPattern::Wildcard() &&
+        i->secondary_pattern == ContentSettingsPattern::Wildcard() &&
+        i->source != "preferences") {
+      continue;
+    }
+
     exceptions.Append(
         GetNotificationExceptionForPage(i->primary_pattern, i->setting,
                                         i->source));