| 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 b72dfe7301f7415ada5ba89467cd48e087cdbfd1..0a13d795778bfb59e72269df61e054e18f47f244 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -838,7 +838,7 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
|
| continue;
|
| }
|
| all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
|
| - [i->secondary_pattern] = i->setting;
|
| + [i->secondary_pattern] = i->GetContentSetting();
|
| }
|
|
|
| base::ListValue exceptions;
|
| @@ -909,11 +909,9 @@ void ContentSettingsHandler::UpdateNotificationExceptionsView() {
|
| continue;
|
| }
|
|
|
| - exceptions.Append(
|
| - GetNotificationExceptionForPage(i->primary_pattern,
|
| - i->secondary_pattern,
|
| - i->setting,
|
| - i->source));
|
| + exceptions.Append(GetNotificationExceptionForPage(
|
| + i->primary_pattern, i->secondary_pattern, i->GetContentSetting(),
|
| + i->source));
|
| }
|
|
|
| base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
|
|
|