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

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

Issue 1906533002: Add 'autoplay' content settings and expose it to Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
57 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 57 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
58 CONTENT_SETTINGS_TYPE_AUTOPLAY,
58 }; 59 };
59 60
60 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, 61 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,
61 size_t* num_values) { 62 size_t* num_values) {
62 // Translate the list above into a map for fast lookup. 63 // Translate the list above into a map for fast lookup.
63 typedef base::hash_map<int, int> Map; 64 typedef base::hash_map<int, int> Map;
64 CR_DEFINE_STATIC_LOCAL(Map, kMap, ()); 65 CR_DEFINE_STATIC_LOCAL(Map, kMap, ());
65 if (kMap.empty()) { 66 if (kMap.empty()) {
66 for (size_t i = 0; i < arraysize(kHistogramOrder); ++i) { 67 for (size_t i = 0; i < arraysize(kHistogramOrder); ++i) {
67 if (kHistogramOrder[i] != CONTENT_SETTINGS_TYPE_DEFAULT) 68 if (kHistogramOrder[i] != CONTENT_SETTINGS_TYPE_DEFAULT)
(...skipping 21 matching lines...) Expand all
89 ContentSettingPatternSource::ContentSettingPatternSource() 90 ContentSettingPatternSource::ContentSettingPatternSource()
90 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { 91 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
91 } 92 }
92 93
93 ContentSettingPatternSource::ContentSettingPatternSource( 94 ContentSettingPatternSource::ContentSettingPatternSource(
94 const ContentSettingPatternSource& other) = default; 95 const ContentSettingPatternSource& other) = default;
95 96
96 RendererContentSettingRules::RendererContentSettingRules() {} 97 RendererContentSettingRules::RendererContentSettingRules() {}
97 98
98 RendererContentSettingRules::~RendererContentSettingRules() {} 99 RendererContentSettingRules::~RendererContentSettingRules() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698