Index: tools/metrics/histograms/histograms.xml |
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml |
index 1374c6a8e1b185e623e53d97f74f13ca3128b708..da88c4fb2eb990a7b8f6e1ffa02c2eab16c86845 100644 |
--- a/tools/metrics/histograms/histograms.xml |
+++ b/tools/metrics/histograms/histograms.xml |
@@ -2863,6 +2863,22 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
<summary>The default popups setting at profile open.</summary> |
</histogram> |
+<histogram name="ContentSettings.DefaultPushMessagingSetting" |
+ enum="ContentSetting"> |
+ <owner>miguelg@chromium.org</owner> |
+ <summary> |
+ The default permission setting for push messages at profile open. |
+ </summary> |
+</histogram> |
+ |
+<histogram name="ContentSettings.PermissionActions" enum="PermissionAction"> |
+ <owner>miguelg</owner> |
+ <summary> |
+ Used on a per permission basis (see histogram_suffix below). Tracks whether |
+ a permission was granted,rejected... |
+ </summary> |
+</histogram> |
+ |
<histogram name="Cookie.ParsedCookieStatus" enum="ParsedCookieStatus"> |
<obsolete> |
Deprecated as of 9/2013. Experiment to measure control characters in cookies |
@@ -44137,6 +44153,14 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</int> |
</enum> |
+<enum name="PermissionAction" type="int"> |
+ <int value="0" label="REQUESTED"/> |
+ <int value="1" label="GRANTED"/> |
+ <int value="2" label="DENYED"/> |
Bernhard Bauer
2014/07/14 15:22:15
Nit: DENIED
Miguel Garcia
2014/07/14 16:57:50
Done.
|
+ <int value="3" label="DISMISSED"/> |
+ <int value="4" label="IGNORED"/> |
+</enum> |
+ |
<enum name="PhotoEditorFileType" type="int"> |
<int value="0" label="jpg"/> |
<int value="1" label="png"/> |
@@ -50490,6 +50514,12 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
<affected-histogram name="PerformanceMonitor.HighCPU"/> |
</histogram_suffixes> |
+<histogram_suffixes name="PermissionActions"> |
+ <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/> |
+ <suffix name="PushMessaging" label="Push messaging permission actions"/> |
+ <affected-histogram name="ContentSettings.PermissionActions"/> |
+</histogram_suffixes> |
+ |
<histogram_suffixes name="PpapiPluginName"> |
<suffix name="libpepflashplayer.so" label="Flash player on Linux or Cros"/> |
<suffix name="libwidevinecdmadapter.so" |