Disable Web Notifications in Incognito

components/content_settings/core/browser/content_settings_info.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_INFO_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_INFO_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings.h"
 
 namespace content_settings {
 
 class WebsiteSettingsInfo;
 
 class ContentSettingsInfo {
  public:
   enum IncognitoBehavior {
     // Content setting will be inherited from regular to incognito profiles
     // as usual.
     INHERIT_IN_INCOGNITO,
 
-    // Content setting will only partially inherit from regular to incognito
-    // profiles: BLOCK will inherit as usual, but ALLOW will become ASK.
-    // This is unusual, so seek privacy review before using this.
-    INHERIT_IN_INCOGNITO_EXCEPT_ALLOW
+    // Content setting is disallowed in incognito. However, to prevent sites
+    // from using this setting to detect whether incognito mode is active, the
+    // actual behavior is more subtle. The content setting will only partially
+    // inherit from regular to incognito profiles: BLOCK will inherit as usual,
+    // but ALLOW will become ASK. Only once the website actually requests the
+    // permission, will it then be automatically denied after a random time
+    // delay (simulating a user clicking a bubble/infobar). This is unusual, so
+    // seek privacy review before using this.
+    DENY_IN_INCOGNITO_AFTER_DELAY

[raymes, 2016/01/12 06:00:41]

Now that I think about it, could we instead remove the part about the delay from
the name here? That part seems more specific to PermissionContext and if we have
the special logic in a subclass of PermissionContext, we might be able to leave
this named as INHERIT_IN_INCOGNITO_EXCEPT_ALLOW. wdyt?

[johnme, 2016/01/12 18:04:52]

Done. I've moved the main behavior to a simple override of
NotificationPermissionContext::DecidePermission, and a check in the
PermissionMenuModel constructor. So now this content settings layer enum only
controls the inheritance part. Mounir also agreed that this was cleaner.

   };
 
   // This object does not take ownership of |website_settings_info|.
   ContentSettingsInfo(const WebsiteSettingsInfo* website_settings_info,
                       const std::vector<std::string>& whitelisted_schemes,
                       const std::set<ContentSetting>& valid_settings,
                       IncognitoBehavior incognito_behavior);
   ~ContentSettingsInfo();
 
   const WebsiteSettingsInfo* website_settings_info() const {
@@ skipping 12 matching lines @@
   const std::vector<std::string> whitelisted_schemes_;
   const std::set<ContentSetting> valid_settings_;
   const IncognitoBehavior incognito_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsInfo);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_INFO_H_