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 01e6809e03ca3e89f81aeb43d388576ee5f0ddf2..ed25e1ce4d94c7984cc06adf320913e8489c0453 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -3064,6 +3064,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="ContentSettings.MixedScript"
+    enum="ContentSettingMixedScriptAction">
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks whether the mixed content shield was shown, and how the user
+    interacted with it.
+  </summary>
+</histogram>
+
 <histogram name="ContentSettings.PermissionActions" enum="PermissionAction">
   <owner>miguelg@chromium.org</owner>
   <summary>
@@ -39807,6 +39816,21 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="4" label="SESSION_ONLY"/>
 </enum>
 
+<enum name="ContentSettingMixedScriptAction" type="int">
+  <int value="0" label="MIXEDSCRIPT_DISPLAYED_SHIELD">
+    Displayed mixed content shield.
+  </int>
+  <int value="1" label="MIXEDSCRIPT_DISPLAYED_BUBBLE">
+    Bubble shown (user clicked mixed content shield)
+  </int>
+  <int value="2" label="MIXEDSCRIPT_CLICKED_ALLOW">
+    User clicked &quot;Load Unsafe Scripts&quot;
+  </int>
+  <int value="3" label="MIXEDSCRIPT_CLICKED_LEARN_MORE">
+    User clicked &quot;Learn more&quot;
+  </int>

[Ilya Sherman, 2014/10/16 03:24:51]

Optional nit: I would suggest writing these as something like:

<int value="0" label="Displayed shield"/>
<int value="1" label="Displayed bubble"/>
<int value="2" label="Clicked allow"/>
<int value="3" label="Clicked learn more"/>

IMO, that's easier for a dashboard user to read than ALL_CAPS_LABELS, and most
users won't ever see the on-hover text.

[lgarron, 2014/10/16 22:00:54]

Sure. I wanted to be thorough, but I suppose someone like me could probably
track down the source of the metric in the source if they needed to, regardless
of how detailed the labels are.

+</enum>
+
 <enum name="CookieDeletionCause" type="int">
   <summary>Reason why a cookie was removed from the cookie store</summary>
   <int value="0" label="explicit">