summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddorwin <ddorwin@chromium.org>2015-05-14 21:41:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 04:41:40 +0000
commit8f9b2d98aa7d9bd22b36e725ee68d3fad30ed34a (patch)
treeec70e5197b014960ce808aabf28536f040b2fc69
parentd7411976f6467bf4519f66f32b4459717e7352d7 (diff)
downloadchromium_src-8f9b2d98aa7d9bd22b36e725ee68d3fad30ed34a.zip
chromium_src-8f9b2d98aa7d9bd22b36e725ee68d3fad30ed34a.tar.gz
chromium_src-8f9b2d98aa7d9bd22b36e725ee68d3fad30ed34a.tar.bz2
Enable unprefixed EME in WebView.
BUG=394931 Review URL: https://codereview.chromium.org/1130253007 Cr-Commit-Position: refs/heads/master@{#330041}
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index ac2bac5..3d3803e 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -77,9 +77,6 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
// Web Notification API and the Push API are not supported (crbug.com/434712)
cl->AppendSwitch(switches::kDisableNotifications);
- // TODO(ddorwin): Enable unprefixed EME. See http://crbug.com/394931.
- cl->AppendSwitch(switches::kDisableEncryptedMedia);
-
// WebRTC hardware decoding is not supported, internal bug 15075307
cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
cl->AppendSwitch(switches::kDisableAcceleratedVideoDecode);