Restore the iframe behavior of notification permissions

chrome/browser/content_settings/permission_queue_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
@@ skipping 351 matching lines @@
     bool allowed) {
   if (requesting_frame.GetOrigin().SchemeIsFile()) {
     // Chrome can be launched with --disable-web-security which allows
     // geolocation requests from file:// URLs. We don't want to store these
     // in the host content settings map.
     return;
   }
 
   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()),
       type_,
       std::string(),
       content_setting);
 }