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" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (deprecated). | 46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (deprecated). |
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_KEYGEN, |
| 56 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, |
56 }; | 57 }; |
57 | 58 |
58 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, | 59 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, |
59 size_t* num_values) { | 60 size_t* num_values) { |
60 // Translate the list above into a map for fast lookup. | 61 // Translate the list above into a map for fast lookup. |
61 typedef base::hash_map<int, int> Map; | 62 typedef base::hash_map<int, int> Map; |
62 CR_DEFINE_STATIC_LOCAL(Map, kMap, ()); | 63 CR_DEFINE_STATIC_LOCAL(Map, kMap, ()); |
63 if (kMap.empty()) { | 64 if (kMap.empty()) { |
64 for (size_t i = 0; i < arraysize(kHistogramOrder); ++i) { | 65 for (size_t i = 0; i < arraysize(kHistogramOrder); ++i) { |
65 if (kHistogramOrder[i] != CONTENT_SETTINGS_TYPE_DEFAULT) | 66 if (kHistogramOrder[i] != CONTENT_SETTINGS_TYPE_DEFAULT) |
(...skipping 18 matching lines...) Expand all Loading... |
84 source(source), | 85 source(source), |
85 incognito(incognito) {} | 86 incognito(incognito) {} |
86 | 87 |
87 ContentSettingPatternSource::ContentSettingPatternSource() | 88 ContentSettingPatternSource::ContentSettingPatternSource() |
88 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { | 89 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { |
89 } | 90 } |
90 | 91 |
91 RendererContentSettingRules::RendererContentSettingRules() {} | 92 RendererContentSettingRules::RendererContentSettingRules() {} |
92 | 93 |
93 RendererContentSettingRules::~RendererContentSettingRules() {} | 94 RendererContentSettingRules::~RendererContentSettingRules() {} |
OLD | NEW |