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 23 matching lines...) Expand all Loading... | |
| 34 CONTENT_SETTINGS_TYPE_FULLSCREEN, | 34 CONTENT_SETTINGS_TYPE_FULLSCREEN, |
| 35 CONTENT_SETTINGS_TYPE_MOUSELOCK, | 35 CONTENT_SETTINGS_TYPE_MOUSELOCK, |
| 36 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, | 36 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, |
| 37 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed). | 37 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed). |
| 38 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, | 38 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, |
| 39 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, | 39 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, |
| 40 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, | 40 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, |
| 41 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, | 41 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, |
| 42 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, | 42 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, |
| 43 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, | 43 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
| 44 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, | 44 CONTENT_SETTINGS_TYPE_DEFAULT, |
|
tsergeant
2016/07/21 04:57:29
Nit: Add a comment like the other removed items
raymes
2016/07/25 01:48:24
Done.
| |
| 45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, | 45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, |
| 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, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 ContentSettingPatternSource::ContentSettingPatternSource() | 90 ContentSettingPatternSource::ContentSettingPatternSource() |
| 91 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { | 91 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { |
| 92 } | 92 } |
| 93 | 93 |
| 94 ContentSettingPatternSource::ContentSettingPatternSource( | 94 ContentSettingPatternSource::ContentSettingPatternSource( |
| 95 const ContentSettingPatternSource& other) = default; | 95 const ContentSettingPatternSource& other) = default; |
| 96 | 96 |
| 97 RendererContentSettingRules::RendererContentSettingRules() {} | 97 RendererContentSettingRules::RendererContentSettingRules() {} |
| 98 | 98 |
| 99 RendererContentSettingRules::~RendererContentSettingRules() {} | 99 RendererContentSettingRules::~RendererContentSettingRules() {} |
| OLD | NEW |