chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e0d755688cd7aaa6c3a25949cfc87fbe09f5dfd7..7784a626302d6c8526b7c1822a7901f3a35e686e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5525,6 +5525,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION" desc="Description of chrome:flags option to turn on Origin header for WebRTC STUN messages">
         When enabled, Stun messages generated by WebRTC will contain the Origin header.
       </message>
+      <if expr="not is_android and not is_ios">

[hbos_chromium, 2016/02/25 15:20:16]

Is it right or wrong to have these ifs here? The feature is not supported on
android/ios, but unsupported experiments are still listed as unsupported, so
these strings would still be included, yeah?

+        <message name="IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME" desc="Name of chrome:flags option to enable WebRTC H.264 sw encoder/decoder">
+          WebRTC H.264 software video encoder/decoder
+        </message>
+        <message name="IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION" desc="Description of chrome:flags option to enable WebRTC H.264 sw encoder/decoder">
+          When enabled, a software implementation of H.264 video encoder and decoder are included. If other implementations are also available they may still be used instead (e.g. hardware should typically be preferred to software).
+        </message>
+      </if>
       <message name="IDS_FLAGS_WEBVR_NAME" desc="Name of the 'Enable WebVR' flag.">
         WebVR
       </message>