components/content_settings/core/browser/website_settings_registry.cc - Issue 2651123002: Migrate content setting PROMPT_NO_DECISION_COUNT to PERMISSION_AUTOBLOCKER_DATA

Side by Side Diff: components/content_settings/core/browser/website_settings_registry.cc

Issue 2651123002: Migrate content setting PROMPT_NO_DECISION_COUNT to PERMISSION_AUTOBLOCKER_DATA (Closed)

Patch Set: Rename pref Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « components/content_settings/core/browser/content_settings_pref_provider.cc ('k') | components/content_settings/core/common/content_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "components/content_settings/core/browser/website_settings_registry.h"	5 #include "components/content_settings/core/browser/website_settings_registry.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/memory/ptr_util.h"	10 #include "base/memory/ptr_util.h"

(...skipping 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr,	135 Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr,

136 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,	136 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,

137 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,	137 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

138 DESKTOP \| PLATFORM_ANDROID,	138 DESKTOP \| PLATFORM_ANDROID,

139 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);	139 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

140 Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr,	140 Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr,

141 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,	141 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,

142 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,	142 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,

143 DESKTOP \| PLATFORM_ANDROID,	143 DESKTOP \| PLATFORM_ANDROID,

144 WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);	144 WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);

	145 // TODO(raymes): Deprecated. See crbug.com/681709. Remove after M60.

145 Register(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,	146 Register(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,

146 "prompt-no-decision-count", nullptr, WebsiteSettingsInfo::UNSYNCABLE,	147 "prompt-no-decision-count", nullptr, WebsiteSettingsInfo::UNSYNCABLE,

147 WebsiteSettingsInfo::NOT_LOSSY,	148 WebsiteSettingsInfo::NOT_LOSSY,

148 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,	149 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

149 DESKTOP \| PLATFORM_ANDROID,	150 DESKTOP \| PLATFORM_ANDROID,

150 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);	151 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

151 Register(CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, "important-site-info",	152 Register(CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, "important-site-info",

152 nullptr, WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,	153 nullptr, WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,

153 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,	154 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

154 DESKTOP \| PLATFORM_ANDROID,	155 DESKTOP \| PLATFORM_ANDROID,

155 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);	156 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

	157 Register(CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,

	158 "permission-autoblocking-data", nullptr,

	159 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,

	160 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

	161 DESKTOP \| PLATFORM_ANDROID,

	162 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

156 }	163 }

157	164

158 } // namespace content_settings	165 } // namespace content_settings

OLD	NEW