OLD | NEW |
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" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 | 12 |
13 ContentSetting IntToContentSetting(int content_setting) { | 13 ContentSetting IntToContentSetting(int content_setting) { |
14 return ((content_setting < 0) || | 14 return ((content_setting < 0) || |
15 (content_setting >= CONTENT_SETTING_NUM_SETTINGS)) ? | 15 (content_setting >= CONTENT_SETTING_NUM_SETTINGS)) ? |
16 CONTENT_SETTING_DEFAULT : static_cast<ContentSetting>(content_setting); | 16 CONTENT_SETTING_DEFAULT : static_cast<ContentSetting>(content_setting); |
17 } | 17 } |
18 | 18 |
19 // WARNING: This array should not be reordered or removed as it is used for | 19 // WARNING: This array should not be reordered or removed as it is used for |
20 // histogram values. If a ContentSettingsType value has been removed, the entry | 20 // histogram values. If a ContentSettingsType value has been removed, the entry |
21 // must be replaced by a placeholder. It should correspond directly to the | 21 // must be replaced by a placeholder. It should correspond directly to the |
22 // ContentType enum in histograms.xml. | 22 // ContentType enum in histograms.xml. |
23 // TODO(raymes): We should use a sparse histogram here on the hash of the | 23 // TODO(raymes): We should use a sparse histogram here on the hash of the |
24 // content settings type name instead. | 24 // content settings type name instead. |
| 25 // TODO(raymes): This has become out of sync with histograms.xml. See |
| 26 // crbug.com/697234. |
25 ContentSettingsType kHistogramOrder[] = { | 27 ContentSettingsType kHistogramOrder[] = { |
26 CONTENT_SETTINGS_TYPE_COOKIES, | 28 CONTENT_SETTINGS_TYPE_COOKIES, |
27 CONTENT_SETTINGS_TYPE_IMAGES, | 29 CONTENT_SETTINGS_TYPE_IMAGES, |
28 CONTENT_SETTINGS_TYPE_JAVASCRIPT, | 30 CONTENT_SETTINGS_TYPE_JAVASCRIPT, |
29 CONTENT_SETTINGS_TYPE_PLUGINS, | 31 CONTENT_SETTINGS_TYPE_PLUGINS, |
30 CONTENT_SETTINGS_TYPE_POPUPS, | 32 CONTENT_SETTINGS_TYPE_POPUPS, |
31 CONTENT_SETTINGS_TYPE_GEOLOCATION, | 33 CONTENT_SETTINGS_TYPE_GEOLOCATION, |
32 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, | 34 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, |
33 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, | 35 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, |
34 CONTENT_SETTINGS_TYPE_DEFAULT, // FULLSCREEN (removed). | 36 CONTENT_SETTINGS_TYPE_DEFAULT, // FULLSCREEN (removed). |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ContentSettingPatternSource::ContentSettingPatternSource() | 96 ContentSettingPatternSource::ContentSettingPatternSource() |
95 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { | 97 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { |
96 } | 98 } |
97 | 99 |
98 ContentSettingPatternSource::ContentSettingPatternSource( | 100 ContentSettingPatternSource::ContentSettingPatternSource( |
99 const ContentSettingPatternSource& other) = default; | 101 const ContentSettingPatternSource& other) = default; |
100 | 102 |
101 RendererContentSettingRules::RendererContentSettingRules() {} | 103 RendererContentSettingRules::RendererContentSettingRules() {} |
102 | 104 |
103 RendererContentSettingRules::~RendererContentSettingRules() {} | 105 RendererContentSettingRules::~RendererContentSettingRules() {} |
OLD | NEW |