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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes
Patch Set: address review comments, minor change Created 4 years, 6 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
« no previous file with comments | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_registry_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/content_settings_registry.h" 5 #include "components/content_settings/core/browser/content_settings_registry.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, 126 WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE,
127 WebsiteSettingsRegistry::ALL_PLATFORMS, 127 WebsiteSettingsRegistry::ALL_PLATFORMS,
128 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 128 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
129 129
130 Register(CONTENT_SETTINGS_TYPE_IMAGES, "images", CONTENT_SETTING_ALLOW, 130 Register(CONTENT_SETTINGS_TYPE_IMAGES, "images", CONTENT_SETTING_ALLOW,
131 WebsiteSettingsInfo::SYNCABLE, 131 WebsiteSettingsInfo::SYNCABLE,
132 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 132 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
133 kExtensionScheme), 133 kExtensionScheme),
134 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 134 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
135 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 135 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
136 WebsiteSettingsRegistry::DESKTOP | 136 WebsiteSettingsRegistry::DESKTOP,
137 WebsiteSettingsRegistry::PLATFORM_ANDROID,
138 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 137 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
139 138
140 Register(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript", 139 Register(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript",
141 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE, 140 CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE,
142 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 141 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
143 kExtensionScheme), 142 kExtensionScheme),
144 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 143 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
145 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 144 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
146 WebsiteSettingsRegistry::DESKTOP | 145 WebsiteSettingsRegistry::DESKTOP |
147 WebsiteSettingsRegistry::PLATFORM_ANDROID, 146 WebsiteSettingsRegistry::PLATFORM_ANDROID,
148 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 147 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
149 148
150 Register(CONTENT_SETTINGS_TYPE_PLUGINS, "plugins", 149 Register(CONTENT_SETTINGS_TYPE_PLUGINS, "plugins",
151 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, 150 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
152 WebsiteSettingsInfo::SYNCABLE, 151 WebsiteSettingsInfo::SYNCABLE,
153 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 152 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
154 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 153 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
155 CONTENT_SETTING_ASK, 154 CONTENT_SETTING_ASK,
156 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT), 155 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),
157 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 156 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
158 WebsiteSettingsRegistry::DESKTOP | 157 WebsiteSettingsRegistry::DESKTOP,
159 WebsiteSettingsRegistry::PLATFORM_ANDROID,
160 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 158 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
161 159
162 Register(CONTENT_SETTINGS_TYPE_POPUPS, "popups", CONTENT_SETTING_BLOCK, 160 Register(CONTENT_SETTINGS_TYPE_POPUPS, "popups", CONTENT_SETTING_BLOCK,
163 WebsiteSettingsInfo::SYNCABLE, 161 WebsiteSettingsInfo::SYNCABLE,
164 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme, 162 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme,
165 kExtensionScheme), 163 kExtensionScheme),
166 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), 164 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
167 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 165 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
168 WebsiteSettingsRegistry::ALL_PLATFORMS, 166 WebsiteSettingsRegistry::ALL_PLATFORMS,
169 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 167 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
(...skipping 28 matching lines...) Expand all
198 WebsiteSettingsRegistry::DESKTOP | 196 WebsiteSettingsRegistry::DESKTOP |
199 WebsiteSettingsRegistry::PLATFORM_ANDROID, 197 WebsiteSettingsRegistry::PLATFORM_ANDROID,
200 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 198 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
201 199
202 Register(CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock", CONTENT_SETTING_ASK, 200 Register(CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock", CONTENT_SETTING_ASK,
203 WebsiteSettingsInfo::SYNCABLE, 201 WebsiteSettingsInfo::SYNCABLE,
204 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 202 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
205 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 203 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
206 CONTENT_SETTING_ASK), 204 CONTENT_SETTING_ASK),
207 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE, 205 WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,
208 WebsiteSettingsRegistry::DESKTOP | 206 WebsiteSettingsRegistry::DESKTOP,
209 WebsiteSettingsRegistry::PLATFORM_ANDROID,
210 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 207 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
211 208
212 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic", 209 Register(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic",
213 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE, 210 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
214 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), 211 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
215 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 212 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
216 CONTENT_SETTING_ASK), 213 CONTENT_SETTING_ASK),
217 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 214 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
218 WebsiteSettingsRegistry::DESKTOP | 215 WebsiteSettingsRegistry::DESKTOP |
219 WebsiteSettingsRegistry::PLATFORM_ANDROID, 216 WebsiteSettingsRegistry::PLATFORM_ANDROID,
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 if (!website_settings_info) 367 if (!website_settings_info)
371 return; 368 return;
372 369
373 DCHECK(!ContainsKey(content_settings_info_, type)); 370 DCHECK(!ContainsKey(content_settings_info_, type));
374 content_settings_info_[type] = base::WrapUnique( 371 content_settings_info_[type] = base::WrapUnique(
375 new ContentSettingsInfo(website_settings_info, whitelisted_schemes, 372 new ContentSettingsInfo(website_settings_info, whitelisted_schemes,
376 valid_settings, incognito_behavior)); 373 valid_settings, incognito_behavior));
377 } 374 }
378 375
379 } // namespace content_settings 376 } // namespace content_settings
OLDNEW
« no previous file with comments | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_registry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698