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

Side by Side Diff: components/content_settings/core/browser/content_settings_default_provider.cc

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 4 years 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) 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 "components/content_settings/core/browser/content_settings_default_prov ider.h" 5 #include "components/content_settings/core/browser/content_settings_default_prov ider.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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 "ContentSettings.DefaultMediaStreamCameraSetting", 170 "ContentSettings.DefaultMediaStreamCameraSetting",
171 IntToContentSetting(prefs_->GetInteger( 171 IntToContentSetting(prefs_->GetInteger(
172 GetPrefName(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA))), 172 GetPrefName(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA))),
173 CONTENT_SETTING_NUM_SETTINGS); 173 CONTENT_SETTING_NUM_SETTINGS);
174 UMA_HISTOGRAM_ENUMERATION( 174 UMA_HISTOGRAM_ENUMERATION(
175 "ContentSettings.DefaultMIDISysExSetting", 175 "ContentSettings.DefaultMIDISysExSetting",
176 IntToContentSetting(prefs_->GetInteger( 176 IntToContentSetting(prefs_->GetInteger(
177 GetPrefName(CONTENT_SETTINGS_TYPE_MIDI_SYSEX))), 177 GetPrefName(CONTENT_SETTINGS_TYPE_MIDI_SYSEX))),
178 CONTENT_SETTING_NUM_SETTINGS); 178 CONTENT_SETTING_NUM_SETTINGS);
179 UMA_HISTOGRAM_ENUMERATION( 179 UMA_HISTOGRAM_ENUMERATION(
180 "ContentSettings.DefaultKeygenSetting",
181 IntToContentSetting(prefs_->GetInteger(
182 GetPrefName(CONTENT_SETTINGS_TYPE_KEYGEN))),
183 CONTENT_SETTING_NUM_SETTINGS);
184 UMA_HISTOGRAM_ENUMERATION(
185 "ContentSettings.DefaultWebBluetoothGuardSetting", 180 "ContentSettings.DefaultWebBluetoothGuardSetting",
186 IntToContentSetting(prefs_->GetInteger( 181 IntToContentSetting(prefs_->GetInteger(
187 GetPrefName(CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD))), 182 GetPrefName(CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD))),
188 CONTENT_SETTING_NUM_SETTINGS); 183 CONTENT_SETTING_NUM_SETTINGS);
189 UMA_HISTOGRAM_ENUMERATION( 184 UMA_HISTOGRAM_ENUMERATION(
190 "ContentSettings.DefaultAutoplaySetting", 185 "ContentSettings.DefaultAutoplaySetting",
191 IntToContentSetting(prefs_->GetInteger( 186 IntToContentSetting(prefs_->GetInteger(
192 GetPrefName(CONTENT_SETTINGS_TYPE_AUTOPLAY))), 187 GetPrefName(CONTENT_SETTINGS_TYPE_AUTOPLAY))),
193 CONTENT_SETTING_NUM_SETTINGS); 188 CONTENT_SETTING_NUM_SETTINGS);
194 #endif 189 #endif
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // deleted. 367 // deleted.
373 #if !defined(OS_IOS) 368 #if !defined(OS_IOS)
374 prefs_->ClearPref(kObsoleteFullscreenDefaultPref); 369 prefs_->ClearPref(kObsoleteFullscreenDefaultPref);
375 #if !defined(OS_ANDROID) 370 #if !defined(OS_ANDROID)
376 prefs_->ClearPref(kObsoleteMouseLockDefaultPref); 371 prefs_->ClearPref(kObsoleteMouseLockDefaultPref);
377 #endif // !defined(OS_ANDROID) 372 #endif // !defined(OS_ANDROID)
378 #endif // !defined(OS_IOS) 373 #endif // !defined(OS_IOS)
379 } 374 }
380 375
381 } // namespace content_settings 376 } // namespace content_settings
OLDNEW
« no previous file with comments | « chromecast/BUILD.gn ('k') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698