diff options
| author | ddorwin <ddorwin@chromium.org> | 2015-01-26 15:03:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-26 23:04:16 +0000 |
| commit | 73bdb0b48f53c787e48e14637a32de22b8601bb3 (patch) | |
| tree | 8392398dee0d037fdfe68808ac4386e7eb14e745 /mojo | |
| parent | 326b32902255707e5a4154ed4db10f46c9fc8905 (diff) | |
| download | chromium_src-73bdb0b48f53c787e48e14637a32de22b8601bb3.zip chromium_src-73bdb0b48f53c787e48e14637a32de22b8601bb3.tar.gz chromium_src-73bdb0b48f53c787e48e14637a32de22b8601bb3.tar.bz2 | |
Replace "enable-encrypted-media" flag with "disable-encrypted-media".
Invert the logic now that unprefixed EME APIs are enabled by default.
BUG=394918
TEST=Encrypted Media browser tests pass.
Review URL: https://codereview.chromium.org/865793003
Cr-Commit-Position: refs/heads/master@{#313162}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/html_viewer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc index df1bd55..55d4c39 100644 --- a/mojo/services/html_viewer/html_viewer.cc +++ b/mojo/services/html_viewer/html_viewer.cc @@ -52,8 +52,8 @@ namespace html_viewer { // media::Renderer implementation. const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer"; -// Enables support for Encrypted Media Extensions (e.g. MediaKeys). -const char kEnableEncryptedMedia[] = "enable-encrypted-media"; +// Disables support for (unprefixed) Encrypted Media Extensions. +const char kDisableEncryptedMedia[] = "disable-encrypted-media"; class HTMLViewer; @@ -184,8 +184,8 @@ class HTMLViewer : public mojo::ApplicationDelegate, bool enable_mojo_media_renderer = command_line->HasSwitch(kEnableMojoMediaRenderer); - if (command_line->HasSwitch(kEnableEncryptedMedia)) - blink::WebRuntimeFeatures::enableEncryptedMedia(true); + if (command_line->HasSwitch(kDisableEncryptedMedia)) + blink::WebRuntimeFeatures::enableEncryptedMedia(false); compositor_thread_.Start(); web_media_player_factory_.reset(new WebMediaPlayerFactory( |