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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/content_settings/content_settings_default_provider.cc

Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 6 years, 5 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/content_settings/content_settings_default_provider.h" 5 #include "chrome/browser/content_settings/content_settings_default_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 18 matching lines...) Expand all
29 using base::UserMetricsAction; 29 using base::UserMetricsAction;
30 using content::BrowserThread; 30 using content::BrowserThread;
31 31
32 namespace { 32 namespace {
33 33
34 // The default setting for each content type. 34 // The default setting for each content type.
35 const ContentSetting kDefaultSettings[] = { 35 const ContentSetting kDefaultSettings[] = {
36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES 36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES
37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES
38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT
39 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_MEDIA
39 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS 40 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS
40 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS 41 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION 42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS 43 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE 44 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN
45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK 46 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK
46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT 47 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT
47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM 48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM
48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC 49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 "ContentSettings.DefaultImagesSetting", 129 "ContentSettings.DefaultImagesSetting",
129 ValueToContentSetting( 130 ValueToContentSetting(
130 default_settings_[CONTENT_SETTINGS_TYPE_IMAGES].get()), 131 default_settings_[CONTENT_SETTINGS_TYPE_IMAGES].get()),
131 CONTENT_SETTING_NUM_SETTINGS); 132 CONTENT_SETTING_NUM_SETTINGS);
132 UMA_HISTOGRAM_ENUMERATION( 133 UMA_HISTOGRAM_ENUMERATION(
133 "ContentSettings.DefaultJavaScriptSetting", 134 "ContentSettings.DefaultJavaScriptSetting",
134 ValueToContentSetting( 135 ValueToContentSetting(
135 default_settings_[CONTENT_SETTINGS_TYPE_JAVASCRIPT].get()), 136 default_settings_[CONTENT_SETTINGS_TYPE_JAVASCRIPT].get()),
136 CONTENT_SETTING_NUM_SETTINGS); 137 CONTENT_SETTING_NUM_SETTINGS);
137 UMA_HISTOGRAM_ENUMERATION( 138 UMA_HISTOGRAM_ENUMERATION(
139 "ContentSettings.DefaultMediaSetting",
140 ValueToContentSetting(
141 default_settings_[CONTENT_SETTINGS_TYPE_MEDIA].get()),
142 CONTENT_SETTING_NUM_SETTINGS);
143 UMA_HISTOGRAM_ENUMERATION(
138 "ContentSettings.DefaultPluginsSetting", 144 "ContentSettings.DefaultPluginsSetting",
139 ValueToContentSetting( 145 ValueToContentSetting(
140 default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get()), 146 default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get()),
141 CONTENT_SETTING_NUM_SETTINGS); 147 CONTENT_SETTING_NUM_SETTINGS);
142 UMA_HISTOGRAM_ENUMERATION( 148 UMA_HISTOGRAM_ENUMERATION(
143 "ContentSettings.DefaultPopupsSetting", 149 "ContentSettings.DefaultPopupsSetting",
144 ValueToContentSetting( 150 ValueToContentSetting(
145 default_settings_[CONTENT_SETTINGS_TYPE_POPUPS].get()), 151 default_settings_[CONTENT_SETTINGS_TYPE_POPUPS].get()),
146 CONTENT_SETTING_NUM_SETTINGS); 152 CONTENT_SETTING_NUM_SETTINGS);
147 UMA_HISTOGRAM_ENUMERATION( 153 UMA_HISTOGRAM_ENUMERATION(
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // Migrate obsolete cookie prompt mode. 342 // Migrate obsolete cookie prompt mode.
337 if (ValueToContentSetting( 343 if (ValueToContentSetting(
338 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == 344 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
339 CONTENT_SETTING_ASK) { 345 CONTENT_SETTING_ASK) {
340 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( 346 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
341 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 347 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
342 } 348 }
343 } 349 }
344 350
345 } // namespace content_settings 351 } // namespace content_settings
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698