tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 45cc91f35052ca012e8f8b908028caeef06f442d..89c023bccf8408a67a67d1f6dc0fcd532ab000dd 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -28144,6 +28144,25 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Permissions.Requested.CrossOrigin" enum="PermissionStatus">
+  <owner>keenanb@google.com</owner>
+  <owner>jww@chromium.org</owner>
+  <summary>
+    The embedder's permission setting at the time of a cross-origin iframe
+    permission request for a given permission type. See the corresponding
+    histogram suffixes.
+  </summary>
+</histogram>
+
+<histogram name="Permissions.Requested.SameOrigin" enum="PermissionType">
+  <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="Platform.AsvGroup">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -63760,6 +63779,12 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="3" label="IGNORED"/>
 </enum>
 
+<enum name="PermissionStatus" type="int">

[jww, 2015/07/07 18:41:46]

Shouldn't this be far below in the <enums> section? Also,  make sure you run the
histograms.xml tools to pretty print and verify the file.

[keenanb, 2015/07/07 21:02:59]

i was confused for a second and double checked, but the enum is indeed in the
enums section. it just didn't look like it because this viewer does not mark
elisions well.

+  <int value="0" label="PERMISSION_STATUS_GRANTED"/>
+  <int value="1" label="PERMISSION_STATUS_DENIED"/>
+  <int value="2" label="PERMISSION_STATUS_ASK"/>
+</enum>
+
 <enum name="PermissionType" type="int">
   <int value="0" label="PERMISSION_UNKONWN"/>
   <int value="1" label="PERMISSION_MIDI_SYSEX"/>
@@ -73001,7 +73026,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"/>
@@ -73010,6 +73035,7 @@ 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="Permissions.Requested.CrossOrigin"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="PNaClTranslatorTypes" separator=".">