Index: tools/metrics/histograms/histograms.xml |
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml |
index 36452aa5c26c270e116b87468e7b6d6c86212d23..f6474caa6580eba501b9e63da41cbce67d3ae39c 100644 |
--- a/tools/metrics/histograms/histograms.xml |
+++ b/tools/metrics/histograms/histograms.xml |
@@ -3912,6 +3912,27 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. |
<summary>Number of times a given permission was requested.</summary> |
</histogram> |
+<histogram name="ContentSettings.PermissionRequested.OffOrigin" |
+ enum="ContentSetting"> |
+ <owner>keenanb@google.com</owner> |
+ <owner>jww@chromium.org</owner> |
+ <summary> |
+ The embedder's permission setting (allowed, blocked, neither) at the time of |
+ an off-origin iframe permission request (for a given permission type. See |
jww
2015/06/29 21:26:59
nit: This parenthetical reads a bit oddly to me. M
keenanb
2015/06/29 22:43:45
Done.
|
+ the corresponding histogram suffixes.) |
+ </summary> |
+</histogram> |
+ |
+<histogram name="ContentSettings.PermissionRequested.SameOrigin" |
+ enum="PermissionType"> |
jww
2015/06/29 21:26:59
Shouldn't there be an 's' at the end of this, i.e.
keenanb
2015/06/29 22:43:45
no. there is an enum called PermissionType. there
jww
2015/06/29 22:53:23
Yikes! That kinda sucks. Do we really need to chan
|
+ <owner>keenanb@google.com</owner> |
+ <owner>jww@chromium.org</owner> |
+ <summary> |
+ The permission type (geolocation, and such) of a same-origin permission |
+ request. |
+ </summary> |
+</histogram> |
+ |
<histogram name="ContentSettings.PermissionRequested_InsecureOrigin" |
enum="PermissionType"> |
<owner>miguelg@chromium.org</owner> |
@@ -72502,7 +72523,7 @@ To add a new entry, add it with any value and run test to compute valid value. |
<affected-histogram name="PerformanceMonitor.HighCPU"/> |
</histogram_suffixes> |
-<histogram_suffixes name="PermissionActions"> |
+<histogram_suffixes name="PermissionTypes"> |
<suffix name="MidiSysEx" label="Midi SysEx permsision actions"/> |
<suffix name="PushMessaging" label="Push messaging permission actions"/> |
<suffix name="Notifications" label="Notification permission actions"/> |
@@ -72511,6 +72532,8 @@ To add a new entry, add it with any value and run test to compute valid value. |
<affected-histogram name="ContentSettings.PermissionActions"/> |
<affected-histogram name="ContentSettings.PermissionActionsInsecureOrigin"/> |
<affected-histogram name="ContentSettings.PermissionActionsSecureOrigin"/> |
+ <affected-histogram name="ContentSettings.PermissionRequested.OffOrigin"/> |
+ " |
jww
2015/06/29 21:26:59
What's up with this """?
keenanb
2015/06/29 22:43:45
i have no idea. a clean-up script automatically in
|
</histogram_suffixes> |
<histogram_suffixes name="PNaClTranslatorTypes" separator="."> |