| Index: chrome/browser/ui/views/options/content_filter_page_view.cc
|
| diff --git a/chrome/browser/ui/views/options/content_filter_page_view.cc b/chrome/browser/ui/views/options/content_filter_page_view.cc
|
| index 320611d68e3269d4ca8ae6071bad2ff1370b884f..ecede9e656dd312679ae792a68950a59c876f901 100644
|
| --- a/chrome/browser/ui/views/options/content_filter_page_view.cc
|
| +++ b/chrome/browser/ui/views/options/content_filter_page_view.cc
|
| @@ -152,6 +152,8 @@ void ContentFilterPageView::InitControlLayout() {
|
|
|
| registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED,
|
| NotificationService::AllSources());
|
| + registrar_.Add(this, NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED,
|
| + NotificationService::AllSources());
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -165,6 +167,8 @@ void ContentFilterPageView::UpdateView() {
|
| } else if (content_type_ == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
|
| default_setting = profile()->GetDesktopNotificationService()->
|
| GetDefaultContentSetting();
|
| + is_content_type_managed = profile()->GetDesktopNotificationService()->
|
| + IsDefaultContentSettingManaged();
|
| } else {
|
| default_setting = profile()->GetHostContentSettingsMap()->
|
| GetDefaultContentSetting(content_type_);
|
| @@ -267,6 +271,12 @@ void ContentFilterPageView::Observe(NotificationType type,
|
| NotifyContentSettingsChanged(
|
| Details<HostContentSettingsMap::ContentSettingsDetails>
|
| (details).ptr());
|
| + } else if (type == NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED) {
|
| + HostContentSettingsMap::ContentSettingsDetails content_settings_details(
|
| + HostContentSettingsMap::Pattern(),
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
|
| + "");
|
| + NotifyContentSettingsChanged(&content_settings_details);
|
| } else {
|
| OptionsPageBase::Observe(type, source, details);
|
| }
|
|
|