| 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 532878e9c749f1f8fc90ff61c550c67540119875..e8285822a6da314695dd026ab6bfd223a380e5c1 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 };
|
| +
|
| 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_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
|
| };
|
|
|