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 8f78e634dc866d0b27a2d102856e709dae9819af..ea45f6f6d4b707b7144a3baed774abef42411258 100644 |
--- a/components/content_settings/core/browser/content_settings_default_provider.cc |
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc |
@@ -126,22 +126,31 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_POPUPS))), |
CONTENT_SETTING_NUM_SETTINGS); |
-#if !defined(OS_IOS) |
+#if !defined(OS_IOS) && !defined(OS_ANDROID) |
UMA_HISTOGRAM_ENUMERATION( |
"ContentSettings.DefaultImagesSetting", |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_IMAGES))), |
CONTENT_SETTING_NUM_SETTINGS); |
UMA_HISTOGRAM_ENUMERATION( |
- "ContentSettings.DefaultJavaScriptSetting", |
+ "ContentSettings.DefaultPluginsSetting", |
IntToContentSetting(prefs_->GetInteger( |
- GetPrefName(CONTENT_SETTINGS_TYPE_JAVASCRIPT))), |
+ GetPrefName(CONTENT_SETTINGS_TYPE_PLUGINS))), |
CONTENT_SETTING_NUM_SETTINGS); |
UMA_HISTOGRAM_ENUMERATION( |
- "ContentSettings.DefaultPluginsSetting", |
+ "ContentSettings.DefaultMouseCursorSetting", |
IntToContentSetting(prefs_->GetInteger( |
- GetPrefName(CONTENT_SETTINGS_TYPE_PLUGINS))), |
+ GetPrefName(CONTENT_SETTINGS_TYPE_MOUSELOCK))), |
+ CONTENT_SETTING_NUM_SETTINGS); |
+#endif |
+ |
+#if !defined(OS_IOS) |
+ UMA_HISTOGRAM_ENUMERATION( |
+ "ContentSettings.DefaultJavaScriptSetting", |
+ IntToContentSetting(prefs_->GetInteger( |
+ GetPrefName(CONTENT_SETTINGS_TYPE_JAVASCRIPT))), |
CONTENT_SETTING_NUM_SETTINGS); |
+ |
UMA_HISTOGRAM_ENUMERATION( |
"ContentSettings.DefaultLocationSetting", |
IntToContentSetting(prefs_->GetInteger( |
@@ -152,11 +161,7 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) |
IntToContentSetting(prefs_->GetInteger( |
GetPrefName(CONTENT_SETTINGS_TYPE_NOTIFICATIONS))), |
CONTENT_SETTING_NUM_SETTINGS); |
- UMA_HISTOGRAM_ENUMERATION( |
- "ContentSettings.DefaultMouseCursorSetting", |
- IntToContentSetting(prefs_->GetInteger( |
- GetPrefName(CONTENT_SETTINGS_TYPE_MOUSELOCK))), |
- CONTENT_SETTING_NUM_SETTINGS); |
+ |
UMA_HISTOGRAM_ENUMERATION( |
"ContentSettings.DefaultMediaStreamMicSetting", |
IntToContentSetting(prefs_->GetInteger( |