| 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 d331540973c4a19b3a1ae1d9a89de741cbe8ff75..5f90b6ac527ee0105c63a78e9782b2afa1e8f359 100644
|
| --- a/chrome/browser/ui/views/options/content_filter_page_view.cc
|
| +++ b/chrome/browser/ui/views/options/content_filter_page_view.cc
|
| @@ -153,6 +153,8 @@ void ContentFilterPageView::InitControlLayout() {
|
|
|
| registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED,
|
| NotificationService::AllSources());
|
| + registrar_.Add(this, NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED,
|
| + NotificationService::AllSources());
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -166,6 +168,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,
|
| if (type == NotificationType::CONTENT_SETTINGS_CHANGED) {
|
| NotifyContentSettingsChanged(
|
| Details<ContentSettingsDetails>(details).ptr());
|
| + } else if (type == NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED) {
|
| + ContentSettingsDetails content_settings_details(
|
| + ContentSettingPattern(),
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
|
| + "");
|
| + NotifyContentSettingsChanged(&content_settings_details);
|
| } else {
|
| OptionsPageBase::Observe(type, source, details);
|
| }
|
|
|