Stop inheriting push notification permissions from regular to incognito

components/content_settings/core/browser/website_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_WEBSITE_SETTINGS_INFO_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 22 matching lines @@
     REQUESTING_DOMAIN_ONLY_SCOPE,
 
     // Settings scoped to the origin of the requesting frame only.
     REQUESTING_ORIGIN_ONLY_SCOPE,
 
     // Settings scoped to the combination of the origin of the requesting
     // frame and the origin of the top level frame.
     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_; }
   const std::string& name() const { return name_; }
 
   const std::string& pref_name() const { return pref_name_; }
   const std::string& default_value_pref_name() const {
     return default_value_pref_name_;
   }
   const base::Value* initial_default_value() const {
     return initial_default_value_.get();
   }
 
   uint32 GetPrefRegistrationFlags() const;
 
   ScopingType scoping_type() const { return scoping_type_; }
 
+  IncognitoBehavior incognito_behavior() const { return incognito_behavior_; }
+
  private:
   const ContentSettingsType type_;
   const std::string name_;
 
   const std::string pref_name_;
   const std::string default_value_pref_name_;
   const scoped_ptr<base::Value> initial_default_value_;
   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);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_