Rename switch to disable prefixed Encrypted Media APIs.
This will allow the prefixed and unprefixed versions to be controlled independently.
The new unprefixed enable switch and flag are also added, though they currently
have no effect.
Both switches are moved from media_switches to content_switches (the reason
reason the switch was moved no longer applies), and the method for disabling on
Android is changed from the switch to the runtime check.
BUG=224791
Review URL: https://chromiumcodereview.appspot.com/15383003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203511 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3d9e0d7..72c4acd 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -704,11 +704,18 @@
},
#endif
{
- "disable-encrypted-media",
- IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
- IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
+ "enable-encrypted-media",
+ IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
+ IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
kOsDesktop,
- SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)
+ SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
+ },
+ {
+ "disable-encrypted-media",
+ IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
+ IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
+ kOsDesktop,
+ SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia)
},
{
"enable-opus-playback",
