Stop inheriting push notification permissions from regular to incognito

components/content_settings/core/browser/website_settings_info.h

Index: components/content_settings/core/browser/website_settings_info.h
diff --git a/components/content_settings/core/browser/website_settings_info.h b/components/content_settings/core/browser/website_settings_info.h
index 51016ea55209cb803d6ab79e593ea8b354178b81..36733c59dc36ebb88666db993863a0f626b92d43 100644
--- a/components/content_settings/core/browser/website_settings_info.h
+++ b/components/content_settings/core/browser/website_settings_info.h
@@ -40,12 +40,16 @@ class WebsiteSettingsInfo {
     REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE
   };
 
+  enum IncognitoBehavior { INHERIT_IN_INCOGNITO,
+                           INHERIT_IN_INCOGNITO_EXCEPT_ALLOW };

[raymes, 2015/11/30 00:28:46]

Please document each of these

[johnme, 2015/11/30 14:56:58]

Done.

+
   WebsiteSettingsInfo(ContentSettingsType type,
                       const std::string& name,
                       scoped_ptr<base::Value> initial_default_value,
                       SyncStatus sync_status,
                       LossyStatus lossy_status,
-                      ScopingType scoping_type);
+                      ScopingType scoping_type,
+                      IncognitoBehavior incognito_behavior);
   ~WebsiteSettingsInfo();
 
   ContentSettingsType type() const { return type_; }
@@ -63,6 +67,8 @@ class WebsiteSettingsInfo {
 
   ScopingType scoping_type() const { return scoping_type_; }
 
+  IncognitoBehavior incognito_behavior() const { return incognito_behavior_; }
+
  private:
   const ContentSettingsType type_;
   const std::string name_;
@@ -73,6 +79,7 @@ class WebsiteSettingsInfo {
   const SyncStatus sync_status_;
   const LossyStatus lossy_status_;
   const ScopingType scoping_type_;
+  const IncognitoBehavior incognito_behavior_;

[raymes, 2015/11/30 00:28:46]

This isn't really relevant for WebsiteSettings. Can you make this a property of
ContentSettingsInfo instead?

[johnme, 2015/11/30 14:56:58]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
 };