| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 91b039ccd1498e06b6a6f46ecd5075e3adb1d46f..68527c38746f6c0607ccde2b37150ae932d69710 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -5522,20 +5522,12 @@ 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="enable_webrtc and rtc_use_h264">
|
| - <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, an H.264 software video encoder/decoder pair is included. (If a hardware decoder is also available it may be used instead of this decoder).
|
| - </message>
|
| - </if>
|
| <message name="IDS_FLAGS_WEBVR_NAME" desc="Name of the 'Enable WebVR' flag.">
|
| WebVR
|
| </message>
|
| <message name="IDS_FLAGS_WEBVR_DESCRIPTION" desc="Description for the flag to enable WebVR APIs.">
|
| Enabling this option allows web applications to access experimental Virtual Reality APIs.
|
| - </message>
|
| + </message>
|
| <message name="IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_NAME" desc="Name of the 'Compositing for fixed position elements' lab.">
|
| Compositing for fixed position elements.
|
| </message>
|
|
|