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

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

Issue 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-push-content-setting-2
Patch Set: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING 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/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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK, 249 Register(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex", CONTENT_SETTING_ASK,
250 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(), 250 WebsiteSettingsInfo::SYNCABLE, WhitelistedSchemes(),
251 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 251 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
252 CONTENT_SETTING_ASK), 252 CONTENT_SETTING_ASK),
253 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 253 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
254 WebsiteSettingsRegistry::DESKTOP | 254 WebsiteSettingsRegistry::DESKTOP |
255 WebsiteSettingsRegistry::PLATFORM_ANDROID, 255 WebsiteSettingsRegistry::PLATFORM_ANDROID,
256 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 256 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
257 257
258 Register(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, "push-messaging",
259 CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
260 WhitelistedSchemes(),
261 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
262 CONTENT_SETTING_ASK),
263 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
264 WebsiteSettingsRegistry::DESKTOP |
265 WebsiteSettingsRegistry::PLATFORM_ANDROID,
266 ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW);
267
268 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 258 Register(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
269 "protected-media-identifier", CONTENT_SETTING_ASK, 259 "protected-media-identifier", CONTENT_SETTING_ASK,
270 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), 260 WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),
271 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, 261 ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
272 CONTENT_SETTING_ASK), 262 CONTENT_SETTING_ASK),
273 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, 263 WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
274 WebsiteSettingsRegistry::PLATFORM_ANDROID | 264 WebsiteSettingsRegistry::PLATFORM_ANDROID |
275 WebsiteSettingsRegistry::PLATFORM_CHROMEOS, 265 WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
276 ContentSettingsInfo::INHERIT_IN_INCOGNITO); 266 ContentSettingsInfo::INHERIT_IN_INCOGNITO);
277 267
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 if (!website_settings_info) 357 if (!website_settings_info)
368 return; 358 return;
369 359
370 DCHECK(!ContainsKey(content_settings_info_, type)); 360 DCHECK(!ContainsKey(content_settings_info_, type));
371 content_settings_info_[type] = base::WrapUnique( 361 content_settings_info_[type] = base::WrapUnique(
372 new ContentSettingsInfo(website_settings_info, whitelisted_schemes, 362 new ContentSettingsInfo(website_settings_info, whitelisted_schemes,
373 valid_settings, incognito_behavior)); 363 valid_settings, incognito_behavior));
374 } 364 }
375 365
376 } // namespace content_settings 366 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698