Index: components/content_settings/core/browser/content_settings_default_provider.cc |
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc |
index 94c1e9f0a1402edd4b3659f659beafd3c8d44fe7..8f78e634dc866d0b27a2d102856e709dae9819af 100644 |
--- a/components/content_settings/core/browser/content_settings_default_provider.cc |
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc |
@@ -122,6 +122,12 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) |
GetPrefName(CONTENT_SETTINGS_TYPE_COOKIES))), |
CONTENT_SETTING_NUM_SETTINGS); |
UMA_HISTOGRAM_ENUMERATION( |
+ "ContentSettings.DefaultPopupsSetting", |
+ IntToContentSetting(prefs_->GetInteger( |
+ GetPrefName(CONTENT_SETTINGS_TYPE_POPUPS))), |
+ CONTENT_SETTING_NUM_SETTINGS); |
+#if !defined(OS_IOS) |
+ UMA_HISTOGRAM_ENUMERATION( |
"ContentSettings.DefaultImagesSetting", |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_IMAGES))), |
@@ -137,11 +143,6 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) |
GetPrefName(CONTENT_SETTINGS_TYPE_PLUGINS))), |
CONTENT_SETTING_NUM_SETTINGS); |
UMA_HISTOGRAM_ENUMERATION( |
- "ContentSettings.DefaultPopupsSetting", |
- IntToContentSetting(prefs_->GetInteger( |
- GetPrefName(CONTENT_SETTINGS_TYPE_POPUPS))), |
- CONTENT_SETTING_NUM_SETTINGS); |
- UMA_HISTOGRAM_ENUMERATION( |
"ContentSettings.DefaultLocationSetting", |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_GEOLOCATION))), |
@@ -186,7 +187,7 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD))), |
CONTENT_SETTING_NUM_SETTINGS); |
- |
+#endif |
pref_change_registrar_.Init(prefs_); |
PrefChangeRegistrar::NamedChangeCallback callback = base::Bind( |
&DefaultProvider::OnPreferenceChanged, base::Unretained(this)); |