Restore the iframe behavior of notification permissions

chrome/browser/content_settings/permission_queue_controller.cc

Index: chrome/browser/content_settings/permission_queue_controller.cc
diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc
index 191e0850196f26c4d30fd0cc7ef8449c015a0138..9527b6e21ef2824db17e76e1da23ac379fe7331c 100644
--- a/chrome/browser/content_settings/permission_queue_controller.cc
+++ b/chrome/browser/content_settings/permission_queue_controller.cc
@@ -369,6 +369,18 @@ void PermissionQueueController::UpdateContentSetting(
 
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
+
+  if (type_ == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {

[Peter Beverloo, 2014/09/23 15:58:47]

Can you file a bug about removing this (and other) exceptions, and reconsidering
the permission story we have about notifications?

[Miguel Garcia, 2014/09/23 16:53:38]

Done. (crbug.com/416894)

+    profile_->GetHostContentSettingsMap()->SetContentSetting(
+          ContentSettingsPattern::FromURLNoWildcard(

[Peter Beverloo, 2014/09/23 15:58:46]

nit: indent with four spaces.

[Miguel Garcia, 2014/09/23 16:53:38]

Done.

+              requesting_frame.GetOrigin()),
+          ContentSettingsPattern::Wildcard(),

[Bernhard Bauer, 2014/09/23 16:13:02]

This is the only difference to the call below, right? If so, consider pulling
this out into a variable and merging the two calls.

[Miguel Garcia, 2014/09/23 16:53:38]

Done.

+          CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+          std::string(),
+          content_setting);
+    return;
+  }
+
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin()),