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

Side by Side Diff: components/content_settings/core/common/content_settings.cc

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 4 years 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/common/content_settings.h" 5 #include "components/content_settings/core/common/content_settings.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (removed). 46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (removed).
47 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 47 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
48 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 48 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
49 #else 49 #else
50 CONTENT_SETTINGS_TYPE_DEFAULT, // PROTECTED_MEDIA_IDENTIFIER (mobile only). 50 CONTENT_SETTINGS_TYPE_DEFAULT, // PROTECTED_MEDIA_IDENTIFIER (mobile only).
51 #endif 51 #endif
52 CONTENT_SETTINGS_TYPE_APP_BANNER, 52 CONTENT_SETTINGS_TYPE_APP_BANNER,
53 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, 53 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
54 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, 54 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
55 CONTENT_SETTINGS_TYPE_KEYGEN, 55 CONTENT_SETTINGS_TYPE_DEFAULT, // KEYGEN (removed)
56 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, 56 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
57 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 57 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
58 CONTENT_SETTINGS_TYPE_AUTOPLAY, 58 CONTENT_SETTINGS_TYPE_AUTOPLAY,
59 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, 59 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
60 CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, 60 CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO,
61 }; 61 };
62 62
63 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, 63 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,
64 size_t* num_values) { 64 size_t* num_values) {
65 // Translate the list above into a map for fast lookup. 65 // Translate the list above into a map for fast lookup.
(...skipping 26 matching lines...) Expand all
92 ContentSettingPatternSource::ContentSettingPatternSource() 92 ContentSettingPatternSource::ContentSettingPatternSource()
93 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { 93 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
94 } 94 }
95 95
96 ContentSettingPatternSource::ContentSettingPatternSource( 96 ContentSettingPatternSource::ContentSettingPatternSource(
97 const ContentSettingPatternSource& other) = default; 97 const ContentSettingPatternSource& other) = default;
98 98
99 RendererContentSettingRules::RendererContentSettingRules() {} 99 RendererContentSettingRules::RendererContentSettingRules() {}
100 100
101 RendererContentSettingRules::~RendererContentSettingRules() {} 101 RendererContentSettingRules::~RendererContentSettingRules() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698