| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 2d0d4e01948e4d5629fc60c2f3638cd9ac9b4268..5fbe98820531e48da51590d6ff67181437fb88f0 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -5995,20 +5995,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION" desc="Description for the flag to disable the prefixed Encrypted Media Extensions APIs (e.g. webkitGenerateKeyRequest()).">
|
| Disable the experimental version of Encrypted Media Extensions on video and audio elements.
|
| </message>
|
| - <if expr="is_android">
|
| - <message name="IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_NAME" desc="Title for the flag to disable infobar popup for protected media identifier.">
|
| - Disable infobar popup for protected media.
|
| - </message>
|
| - <message name="IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_DESCRIPTION" desc="Description for the flag to disable infobar popup for protected media identifier.">
|
| - Disable infobar popup by default when accessing the protected media identifier.
|
| - </message>
|
| - <message name="IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME" desc="Title for the flag to enable non-conmpositing decoding in MediaDrm for encrypted content.">
|
| - Enable non-compositing decoding.
|
| - </message>
|
| - <message name="IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION" desc="Description for the flag to enable non-conmpositing decoding in MediaDrm for encrypted content.">
|
| - Enable non-compositing decoding in MediaDrm by default for Encrypted Media Extensions.
|
| - </message>
|
| - </if>
|
| <message name="IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME" desc="Title for the flag to disable gesture requiment for media playback">
|
| Disable gesture requirement for media playback.
|
| </message>
|
|
|