Chromium Code Reviews| Index: chrome/browser/content_settings/permission_context_uma_util.cc |
| diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc |
| index cb2af3914f54879d57b0553bdedfc76ea0cd9d43..10b9347520a93864d43fb942a535fbf7960f02ce 100644 |
| --- a/chrome/browser/content_settings/permission_context_uma_util.cc |
| +++ b/chrome/browser/content_settings/permission_context_uma_util.cc |
| @@ -139,8 +139,27 @@ void RecordPermissionAction(ContentSettingsType permission, |
| requesting_origin); |
| } |
| +std::string PermissionTypeToString(PermissionType permission_type) { |
| + switch (permission_type) { |
| + case PermissionType::MIDI_SYSEX: |
| + return "MidiSysex"; |
| + case PermissionType::PUSH_MESSAGING: |
| + return "PushMessaging"; |
| + case PermissionType::NOTIFICATIONS: |
| + return "Notifications"; |
| + case PermissionType::GEOLOCATION: |
| + return "Geolocation"; |
| + case PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| + return "ProtectedMediaIdentifier"; |
| + case PermissionType::NUM: |
| + return "?"; |
|
mlamouri (slow - plz ping)
2015/06/29 14:23:07
NOT_REACHED();
And after the switch() |return "";
keenanb
2015/06/29 19:09:00
Done.
|
| + } |
| +} |
| + |
| void RecordPermissionRequest(ContentSettingsType permission, |
| - const GURL& requesting_origin) { |
| + HostContentSettingsMap* host_content_settings_map, |
| + const GURL& requesting_origin, |
| + const GURL& embedding_origin) { |
| bool secure_origin = content::IsOriginSecure(requesting_origin); |
| PermissionType type; |
| switch (permission) { |
| @@ -188,6 +207,33 @@ void RecordPermissionRequest(ContentSettingsType permission, |
| static_cast<base::HistogramBase::Sample>(type), |
| static_cast<base::HistogramBase::Sample>(PermissionType::NUM)); |
| } |
| + |
| + // TODO(keenanb): It may not be worth worrying about, |
| + // but statistics would get skewed if, for example, |
| + // before the user has made a permission decision, |
| + // getCurrentPosition gets called ten times each second |
| + // and generates ten permission requests each second. |
| + // That may be a job for RAPPOR. |
| + |
| + DCHECK(requesting_origin.GetOrigin() == requesting_origin); |
| + DCHECK(embedding_origin.GetOrigin() == embedding_origin); |
| + bool off_origin_iframe = (requesting_origin != embedding_origin); |
| + |
| + if (off_origin_iframe) { |
| + ContentSetting embedding_content_setting = |
| + host_content_settings_map->GetContentSetting( |
| + embedding_origin, embedding_origin, permission, std::string()); |
| + |
| + UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionRequested.OffOrigin_" + |
| + PermissionTypeToString(type), |
| + embedding_content_setting, |
| + CONTENT_SETTING_NUM_SETTINGS); |
| + } else { |
| + UMA_HISTOGRAM_ENUMERATION( |
| + "ContentSettings.PermissionRequested.OnOrigin", |
| + static_cast<base::HistogramBase::Sample>(type), |
| + static_cast<base::HistogramBase::Sample>(PermissionType::NUM)); |
|
mlamouri (slow - plz ping)
2015/06/29 14:23:07
Out of curiosity, why do we want to count these?
keenanb
2015/06/29 19:09:00
to know the ratio. maybe we don't want it though.
|
| + } |
| } |
| } // namespace |
| @@ -195,8 +241,12 @@ void RecordPermissionRequest(ContentSettingsType permission, |
| // Make sure you update histograms.xml permission histogram_suffix if you |
| // add new permission |
| void PermissionContextUmaUtil::PermissionRequested( |
| - ContentSettingsType permission, const GURL& requesting_origin) { |
| - RecordPermissionRequest(permission, requesting_origin); |
| + ContentSettingsType permission, |
| + HostContentSettingsMap* host_content_settings_map, |
| + const GURL& requesting_origin, |
| + const GURL& embedding_origin) { |
| + RecordPermissionRequest(permission, host_content_settings_map, |
| + requesting_origin, embedding_origin); |
| } |
| void PermissionContextUmaUtil::PermissionGranted( |