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

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

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing metrics owner and test ordering. Created 5 years, 1 month 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 UMA_HISTOGRAM_ENUMERATION( 187 UMA_HISTOGRAM_ENUMERATION(
188 "ContentSettings.DefaultMIDISysExSetting", 188 "ContentSettings.DefaultMIDISysExSetting",
189 IntToContentSetting(prefs_->GetInteger( 189 IntToContentSetting(prefs_->GetInteger(
190 GetPrefName(CONTENT_SETTINGS_TYPE_MIDI_SYSEX))), 190 GetPrefName(CONTENT_SETTINGS_TYPE_MIDI_SYSEX))),
191 CONTENT_SETTING_NUM_SETTINGS); 191 CONTENT_SETTING_NUM_SETTINGS);
192 UMA_HISTOGRAM_ENUMERATION( 192 UMA_HISTOGRAM_ENUMERATION(
193 "ContentSettings.DefaultPushMessagingSetting", 193 "ContentSettings.DefaultPushMessagingSetting",
194 IntToContentSetting(prefs_->GetInteger( 194 IntToContentSetting(prefs_->GetInteger(
195 GetPrefName(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING))), 195 GetPrefName(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING))),
196 CONTENT_SETTING_NUM_SETTINGS); 196 CONTENT_SETTING_NUM_SETTINGS);
197 UMA_HISTOGRAM_ENUMERATION(
198 "ContentSettings.DefaultKeygenSetting",
Bernhard Bauer 2015/11/06 11:36:53 Do you need to add this histogram to histograms.xm
svaldez 2015/11/06 14:40:45 Done.
199 IntToContentSetting(prefs_->GetInteger(
200 GetPrefName(CONTENT_SETTINGS_TYPE_KEYGEN))),
201 CONTENT_SETTING_NUM_SETTINGS);
197 202
198 pref_change_registrar_.Init(prefs_); 203 pref_change_registrar_.Init(prefs_);
199 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind( 204 PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(
200 &DefaultProvider::OnPreferenceChanged, base::Unretained(this)); 205 &DefaultProvider::OnPreferenceChanged, base::Unretained(this));
201 WebsiteSettingsRegistry* website_settings = 206 WebsiteSettingsRegistry* website_settings =
202 WebsiteSettingsRegistry::GetInstance(); 207 WebsiteSettingsRegistry::GetInstance();
203 for (const WebsiteSettingsInfo* info : *website_settings) 208 for (const WebsiteSettingsInfo* info : *website_settings)
204 pref_change_registrar_.Add(info->default_value_pref_name(), callback); 209 pref_change_registrar_.Add(info->default_value_pref_name(), callback);
205 } 210 }
206 211
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 } 372 }
368 373
369 void DefaultProvider::DiscardObsoletePreferences() { 374 void DefaultProvider::DiscardObsoletePreferences() {
370 prefs_->ClearPref(kObsoleteDefaultContentSettings); 375 prefs_->ClearPref(kObsoleteDefaultContentSettings);
371 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings); 376 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings);
372 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting); 377 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting);
373 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting); 378 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);
374 } 379 }
375 380
376 } // namespace content_settings 381 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698