Commit c9930753 authored by tsergeant's avatar tsergeant Committed by Commit bot

Rename ContentSettings.PermissionActions histogram to Permission.Actions

BUG=554419

Review URL: https://codereview.chromium.org/1434883002

Cr-Commit-Position: refs/heads/master@{#361062}
parent 4e4d176a
...@@ -95,50 +95,51 @@ void RecordPermissionAction(ContentSettingsType permission, ...@@ -95,50 +95,51 @@ void RecordPermissionAction(ContentSettingsType permission,
case CONTENT_SETTINGS_TYPE_GEOLOCATION: case CONTENT_SETTINGS_TYPE_GEOLOCATION:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, secure_origin,
"ContentSettings.PermissionActions_Geolocation", "Permissions.Action.Geolocation",
"ContentSettings.PermissionActionsSecureOrigin_Geolocation", "Permissions.Action.SecureOrigin.Geolocation",
"ContentSettings.PermissionActionsInsecureOrigin_Geolocation", "Permissions.Action.InsecureOrigin.Geolocation",
action); action);
break; break;
case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, secure_origin,
"ContentSettings.PermissionActions_Notifications", "Permissions.Action.Notifications",
"ContentSettings.PermissionActionsSecureOrigin_Notifications", "Permissions.Action.SecureOrigin.Notifications",
"ContentSettings.PermissionActionsInsecureOrigin_Notifications", "Permissions.Action.InsecureOrigin.Notifications",
action); action);
break; break;
case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, secure_origin,
"ContentSettings.PermissionActions_MidiSysEx", "Permissions.Action.MidiSysEx",
"ContentSettings.PermissionActionsSecureOrigin_MidiSysEx", "Permissions.Action.SecureOrigin.MidiSysEx",
"ContentSettings.PermissionActionsInsecureOrigin_MidiSysEx", "Permissions.Action.InsecureOrigin.MidiSysEx",
action); action);
break; break;
case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, secure_origin,
"ContentSettings.PermissionActions_PushMessaging", "Permissions.Action.PushMessaging",
"ContentSettings.PermissionActionsSecureOrigin_PushMessaging", "Permissions.Action.SecureOrigin.PushMessaging",
"ContentSettings.PermissionActionsInsecureOrigin_PushMessaging", "Permissions.Action.InsecureOrigin.PushMessaging",
action); action);
break; break;
#if defined(OS_ANDROID) || defined(OS_CHROMEOS) #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, secure_origin,
"ContentSettings.PermissionActions_ProtectedMedia", "Permissions.Action.ProtectedMedia",
"ContentSettings.PermissionActionsSecureOrigin_ProtectedMedia", "Permissions.Action.SecureOrigin.ProtectedMedia",
"ContentSettings.PermissionActionsInsecureOrigin_ProtectedMedia", "Permissions.Action.InsecureOrigin.ProtectedMedia",
action); action);
break; break;
#endif #endif
case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
PERMISSION_ACTION_UMA( PERMISSION_ACTION_UMA(
secure_origin, "ContentSettings.PermissionActions_DurableStorage", secure_origin,
"ContentSettings.PermissionActionsSecureOrigin_DurableStorage", "Permissions.Action.DurableStorage",
"ContentSettings.PermissionActionsInsecureOrigin_DurableStorage", "Permissions.Action.SecureOrigin.DurableStorage",
"Permissions.Action.InsecureOrigin.DurableStorage",
action); action);
break; break;
case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
......
...@@ -5154,6 +5154,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. ...@@ -5154,6 +5154,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
</histogram> </histogram>
<histogram name="ContentSettings.PermissionActions" enum="PermissionAction"> <histogram name="ContentSettings.PermissionActions" enum="PermissionAction">
<obsolete>
Removed 11/2015 in favor of Permissions.Action.*
</obsolete>
<owner>miguelg@chromium.org</owner> <owner>miguelg@chromium.org</owner>
<summary> <summary>
Tracks whether a permission was granted, rejected, etc. The suffix of the Tracks whether a permission was granted, rejected, etc. The suffix of the
...@@ -5163,6 +5166,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. ...@@ -5163,6 +5166,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
<histogram name="ContentSettings.PermissionActionsInsecureOrigin" <histogram name="ContentSettings.PermissionActionsInsecureOrigin"
enum="PermissionAction"> enum="PermissionAction">
<obsolete>
Removed 11/2015 in favor of Permissions.Action.InsecureOrigin.*
</obsolete>
<owner>miguelg@chromium.org</owner> <owner>miguelg@chromium.org</owner>
<summary> <summary>
Tracks whether a permission was granted, rejected, etc on an insecure Tracks whether a permission was granted, rejected, etc on an insecure
...@@ -5172,6 +5178,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. ...@@ -5172,6 +5178,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
<histogram name="ContentSettings.PermissionActionsSecureOrigin" <histogram name="ContentSettings.PermissionActionsSecureOrigin"
enum="PermissionAction"> enum="PermissionAction">
<obsolete>
Removed 11/2015 in favor of Permissions.Action.SecureOrigin.*
</obsolete>
<owner>miguelg@chromium.org</owner> <owner>miguelg@chromium.org</owner>
<summary> <summary>
Tracks whether a permission was granted, rejected, etc on a secure origin. Tracks whether a permission was granted, rejected, etc on a secure origin.
...@@ -32104,6 +32113,24 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. ...@@ -32104,6 +32113,24 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
</summary> </summary>
</histogram> </histogram>
<histogram name="Permissions.Action.InsecureOrigin" enum="PermissionAction">
<owner>miguelg@chromium.org</owner>
<owner>mlamouri@chromium.org</owner>
<summary>
Tracks whether a permission was granted, rejected, etc on an insecure
origin. The suffix of the histogram indicates which particular permission.
</summary>
</histogram>
<histogram name="Permissions.Action.SecureOrigin" enum="PermissionAction">
<owner>miguelg@chromium.org</owner>
<owner>mlamouri@chromium.org</owner>
<summary>
Tracks whether a permission was granted, rejected, etc on a secure origin.
The suffix of the histogram indicates which particular permission.
</summary>
</histogram>
<histogram name="Permissions.Requested.CrossOrigin" enum="PermissionStatus"> <histogram name="Permissions.Requested.CrossOrigin" enum="PermissionStatus">
<owner>keenanb@google.com</owner> <owner>keenanb@google.com</owner>
<owner>jww@chromium.org</owner> <owner>jww@chromium.org</owner>
...@@ -81471,9 +81498,17 @@ To add a new entry, add it with any value and run test to compute valid value. ...@@ -81471,9 +81498,17 @@ To add a new entry, add it with any value and run test to compute valid value.
</histogram_suffixes> </histogram_suffixes>
<histogram_suffixes name="PermissionTypes" separator="."> <histogram_suffixes name="PermissionTypes" separator=".">
<suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
<suffix name="PushMessaging" label="Push messaging permission actions"/>
<suffix name="Notifications" label="Notification permission actions"/>
<suffix name="Geolocation" label="Geolocation permission actions"/>
<suffix name="ProtectedMedia" label="Protected media permission actions"/>
<suffix name="DurableStorage" label="Durable Storage permission actions"/>
<suffix name="AudioCapture" label="Microphone permission actions"/> <suffix name="AudioCapture" label="Microphone permission actions"/>
<suffix name="VideoCapture" label="Camera permission actions"/> <suffix name="VideoCapture" label="Camera permission actions"/>
<affected-histogram name="Permissions.Action"/> <affected-histogram name="Permissions.Action"/>
<affected-histogram name="Permissions.Action.InsecureOrigin"/>
<affected-histogram name="Permissions.Action.SecureOrigin"/>
</histogram_suffixes> </histogram_suffixes>
<histogram_suffixes name="PNaClTranslatorTypes" separator="."> <histogram_suffixes name="PNaClTranslatorTypes" separator=".">
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment