Disable Web Notifications in Incognito

components/content_settings/core/browser/host_content_settings_map.cc

 // Copyright (c) 2012 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 "components/content_settings/core/browser/host_content_settings_map.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 53 matching lines @@
 bool SupportsResourceIdentifier(ContentSettingsType content_type) {
   return content_type == CONTENT_SETTINGS_TYPE_PLUGINS;
 }
 
 bool SchemeCanBeWhitelisted(const std::string& scheme) {
   return scheme == content_settings::kChromeDevToolsScheme ||
          scheme == content_settings::kExtensionScheme ||
          scheme == content_settings::kChromeUIScheme;
 }
 
-// Prevents content settings marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW from
-// inheriting CONTENT_SETTING_ALLOW settings from regular to incognito.
+// Prevents content settings marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW or
+// DENY_IN_INCOGNITO_AFTER_DELAY from inheriting CONTENT_SETTING_ALLOW settings
+// from regular to incognito.
 scoped_ptr<base::Value> CoerceSettingInheritedToIncognito(
     ContentSettingsType content_type,
     scoped_ptr<base::Value> value) {
   const content_settings::ContentSettingsInfo* info =
       content_settings::ContentSettingsRegistry::GetInstance()->Get(
           content_type);
-  if (!info)
+  if (!info ||
+      info->incognito_behavior() ==
+          content_settings::ContentSettingsInfo::INHERIT_IN_INCOGNITO) {
     return value;
-  if (info->incognito_behavior() !=
-      content_settings::ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW)
-    return value;
+  }
   ContentSetting setting = content_settings::ValueToContentSetting(value.get());
   if (setting != CONTENT_SETTING_ALLOW)
     return value;
   DCHECK(info->IsSettingValid(CONTENT_SETTING_ASK));
   return content_settings::ContentSettingToValue(CONTENT_SETTING_ASK);
 }
 
 }  // namespace
 
 HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
@@ skipping 650 matching lines @@
         rule.secondary_pattern.Matches(secondary_url)) {
       if (primary_pattern)
         *primary_pattern = rule.primary_pattern;
       if (secondary_pattern)
         *secondary_pattern = rule.secondary_pattern;
       return make_scoped_ptr(rule.value.get()->DeepCopy());
     }
   }
   return scoped_ptr<base::Value>();
 }