| 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..e1208b1b525ad9aa2039c10a67d97f86afb5f0c9 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -57,6 +57,7 @@
|
| #include "components/content_settings/core/browser/website_settings_registry.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| +#include "components/content_settings/core/common/content_settings_utils.h"
|
| #include "components/google/core/browser/google_util.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/signin/core/common/profile_management_switches.h"
|
| @@ -837,8 +838,9 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() {
|
| ->source != site_settings::kPreferencesSource) {
|
| continue;
|
| }
|
| - all_patterns_settings[std::make_pair(i->primary_pattern, i->source)]
|
| - [i->secondary_pattern] = i->setting;
|
| + all_patterns_settings[std::make_pair(i->primary_pattern,
|
| + i->source)][i->secondary_pattern] =
|
| + content_settings::ValueToContentSetting(i->setting_value.get());
|
| }
|
|
|
| base::ListValue exceptions;
|
| @@ -909,11 +911,10 @@ 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,
|
| + content_settings::ValueToContentSetting(i->setting_value.get()),
|
| + i->source));
|
| }
|
|
|
| base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
|
|
|