diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 05:17:17 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 05:17:17 +0000 |
| commit | 40bdc138b3d7a2fa529b59130a735f35eb8adbc2 (patch) | |
| tree | 32efc39b152e8fb63eb7f09c38253da2afb855c2 /chrome/browser/about_flags.cc | |
| parent | 87dea54d9cedc742d52a78c767b02fa21a2c78dc (diff) | |
| download | chromium_src-40bdc138b3d7a2fa529b59130a735f35eb8adbc2.zip chromium_src-40bdc138b3d7a2fa529b59130a735f35eb8adbc2.tar.gz chromium_src-40bdc138b3d7a2fa529b59130a735f35eb8adbc2.tar.bz2 | |
Disable use of MediaDrm by default on Android.
- This disables Widevine key system on Chrome for Android.
- Developer/Tester can use --enable-mediadrm flag to enable MediaDrm manually.
- ClearKey key system still works.
R=ddorwin@chromium.org, qinmin@chromium.org
TBR=jochen@chromium.org
BUG=305422
TEST=Tested on Nexus 10.
Review URL: https://codereview.chromium.org/26708002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 34fb2bd..476ca3e 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -816,6 +816,13 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kDisableInfobarForProtectedMediaIdentifier) }, { + "enable-mediadrm", + IDS_FLAGS_ENABLE_MEDIADRM_NAME, + IDS_FLAGS_ENABLE_MEDIADRM_DESCRIPTION, + kOsAndroid, + SINGLE_VALUE_TYPE(switches::kEnableMediaDrm) + }, + { "mediadrm-enable-non-compositing", IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |