Stop inheriting push notification permissions from regular to incognito

components/content_settings/core/browser/host_content_settings_map.h

 // 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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_checker.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
+#include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 
 class ExtensionService;
 class GURL;
 class PrefService;
 
 namespace base {
@@ skipping 204 matching lines @@
 
   // Schedules any pending lossy website settings to be written to disk.
   void FlushLossyWebsiteSettings();
 
   // Passes ownership of |clock|.
   void SetPrefClockForTesting(scoped_ptr<base::Clock> clock);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
   friend class HostContentSettingsMapTest_NonDefaultSettings_Test;
+  friend
+  scoped_ptr<base::Value> content_settings::GetContentSettingValueAndPatterns(
+      const content_settings::ProviderInterface* provider,
+      const GURL& primary_url,
+      const GURL& secondary_url,
+      ContentSettingsType content_type,
+      const std::string& resource_identifier,
+      bool include_incognito,
+      ContentSettingsPattern* primary_pattern,
+      ContentSettingsPattern* secondary_pattern);
 
   typedef std::map<ProviderType, content_settings::ProviderInterface*>
       ProviderMap;
   typedef ProviderMap::iterator ProviderIterator;
   typedef ProviderMap::const_iterator ConstProviderIterator;
 
   ~HostContentSettingsMap() override;
 
   // Sets a rule to apply the |value| for all sites matching |pattern|,
   // |content_type| and |resource_identifier|. Setting the value to null removes
@@ skipping 33 matching lines @@
   // takes the global on/off switch into account.
   scoped_ptr<base::Value> GetWebsiteSettingInternal(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier,
       content_settings::SettingInfo* info) const;
 
   content_settings::PrefProvider* GetPrefProvider();
 
+  // Prevents content settings marked INHERIT_IN_INCOGNITO_EXCEPT_ALLOW from
+  // inheriting CONTENT_SETTING_ALLOW settings from regular to incognito.
+  static ContentSetting CoerceSettingInheritedToIncognito(
+      ContentSettingsType content_type,
+      ContentSetting setting);
+
 #ifndef NDEBUG
   // This starts as the thread ID of the thread that constructs this
   // object, and remains until used by a different thread, at which
   // point it is set to base::kInvalidThreadId. This allows us to
   // DCHECK on unsafe usage of content_settings_providers_ (they
   // should be set up on a single thread, after which they are
   // immutable).
   mutable base::PlatformThreadId used_from_thread_id_;
 #endif
 
   // Weak; owned by the Profile.
   PrefService* prefs_;
 
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
   // Content setting providers. This is only modified at construction
   // time and by RegisterExtensionService, both of which should happen
   // before any other uses of it.
   ProviderMap content_settings_providers_;
 
   base::ThreadChecker thread_checker_;
 
   base::ObserverList<content_settings::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_