| Index: chrome/browser/ui/webui/options/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| index 7f6b9e09f6314270f5e056a1f6b71abb61215d95..8878f9a97f83e8bc5218705c027e55098fd4b369 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/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));
|
|
|