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

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

Issue 2075103002: Change ContentSettingsType's scoping type and hookup migration code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@do_migration_after_sync
Patch Set: revise test Created 4 years, 4 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 // location. It should be possible to register a setting from the code 109 // location. It should be possible to register a setting from the code
110 // associated with it. 110 // associated with it.
111 111
112 // WARNING: The string names of the permissions passed in below are used to 112 // WARNING: The string names of the permissions passed in below are used to
113 // generate preference names and should never be changed! 113 // generate preference names and should never be changed!
114 114
115 // Website settings. 115 // Website settings.
116 Register(CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, 116 Register(CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
117 "auto-select-certificate", nullptr, WebsiteSettingsInfo::UNSYNCABLE, 117 "auto-select-certificate", nullptr, WebsiteSettingsInfo::UNSYNCABLE,
118 WebsiteSettingsInfo::NOT_LOSSY, 118 WebsiteSettingsInfo::NOT_LOSSY,
119 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, ALL_PLATFORMS, 119 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, ALL_PLATFORMS,
120 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 120 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
121 Register(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 121 Register(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
122 "ssl-cert-decisions", nullptr, WebsiteSettingsInfo::UNSYNCABLE, 122 "ssl-cert-decisions", nullptr, WebsiteSettingsInfo::UNSYNCABLE,
123 WebsiteSettingsInfo::NOT_LOSSY, 123 WebsiteSettingsInfo::NOT_LOSSY,
124 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 124 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
125 DESKTOP | PLATFORM_ANDROID, 125 DESKTOP | PLATFORM_ANDROID,
126 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 126 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
127 Register(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner", nullptr, 127 Register(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner", nullptr,
128 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY, 128 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,
129 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, 129 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
130 DESKTOP | PLATFORM_ANDROID, 130 DESKTOP | PLATFORM_ANDROID,
131 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 131 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
132 Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr, 132 Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr,
133 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY, 133 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,
134 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 134 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
135 DESKTOP | PLATFORM_ANDROID, 135 DESKTOP | PLATFORM_ANDROID,
136 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 136 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
137 Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr, 137 Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr,
138 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY, 138 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
139 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 139 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
140 DESKTOP | PLATFORM_ANDROID, 140 DESKTOP | PLATFORM_ANDROID,
141 WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO); 141 WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);
142 } 142 }
143 143
144 } // namespace content_settings 144 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698