Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

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

Issue 2859783002: [subresource_filter] Make website setting existence imply site activation (Closed)
Patch Set: rebase Created 3 years, 7 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:
View unified diff | Download patch
OLDNEW
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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 "permission-autoblocking-data", nullptr, 158 "permission-autoblocking-data", nullptr,
159 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY, 159 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
160 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 160 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
161 DESKTOP | PLATFORM_ANDROID, 161 DESKTOP | PLATFORM_ANDROID,
162 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 162 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
163 Register( 163 Register(
164 CONTENT_SETTINGS_TYPE_PASSWORD_PROTECTION, "password-protection", nullptr, 164 CONTENT_SETTINGS_TYPE_PASSWORD_PROTECTION, "password-protection", nullptr,
165 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY, 165 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
166 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 166 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
167 DESKTOP | PLATFORM_ANDROID, WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 167 DESKTOP | PLATFORM_ANDROID, WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
168 Register(CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER_DATA, 168 // Set when an origin is activated for subresource filtering and the
169 "subresource-filter-data", nullptr, WebsiteSettingsInfo::UNSYNCABLE, 169 // associated UI is shown to the user. Cleared when a site is de-activated or
170 WebsiteSettingsInfo::LOSSY, 170 // the first URL matching the origin is removed from history.
171 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, PLATFORM_ANDROID, 171 Register(
172 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 172 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER_DATA, "subresource-filter-data",
173 nullptr, WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
174 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
175 DESKTOP | PLATFORM_ANDROID, WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
173 } 176 }
174 177
175 } // namespace content_settings 178 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698