Chromium Code Reviews| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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_DEFAULT, // KEYGEN (removed). | 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_PASSWORD_PROTECTION, | |
|
raymes
2017/03/16 00:38:37
This should go right at the end but you may want t
Jialiu Lin
2017/03/16 17:48:19
Sure. I'll wait for the https://codereview.chromiu
| |
| 58 CONTENT_SETTINGS_TYPE_AUTOPLAY, | 59 CONTENT_SETTINGS_TYPE_AUTOPLAY, |
| 59 CONTENT_SETTINGS_TYPE_DEFAULT, // PROMPT_NO_DECISION_COUNT (migrated). | 60 CONTENT_SETTINGS_TYPE_DEFAULT, // PROMPT_NO_DECISION_COUNT (migrated). |
| 60 CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, | 61 CONTENT_SETTINGS_TYPE_IMPORTANT_SITE_INFO, |
| 61 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, | 62 CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, |
| 62 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, | 63 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, |
| 63 }; | 64 }; |
| 64 | 65 |
| 65 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, | 66 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, |
| 66 size_t* num_values) { | 67 size_t* num_values) { |
| 67 // Translate the list above into a map for fast lookup. | 68 // Translate the list above into a map for fast lookup. |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 94 ContentSettingPatternSource::ContentSettingPatternSource() | 95 ContentSettingPatternSource::ContentSettingPatternSource() |
| 95 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { | 96 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { |
| 96 } | 97 } |
| 97 | 98 |
| 98 ContentSettingPatternSource::ContentSettingPatternSource( | 99 ContentSettingPatternSource::ContentSettingPatternSource( |
| 99 const ContentSettingPatternSource& other) = default; | 100 const ContentSettingPatternSource& other) = default; |
| 100 | 101 |
| 101 RendererContentSettingRules::RendererContentSettingRules() {} | 102 RendererContentSettingRules::RendererContentSettingRules() {} |
| 102 | 103 |
| 103 RendererContentSettingRules::~RendererContentSettingRules() {} | 104 RendererContentSettingRules::~RendererContentSettingRules() {} |
| OLD | NEW |