diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-23 02:11:46 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-23 02:11:46 +0000 |
| commit | 363a670b98140a1b7a65e490decc494aa8960344 (patch) | |
| tree | de29faedde76700f698a6c67a9ba09eb5f0b779b /media | |
| parent | 0d0b1a7ee20003bb8bd3dcf9ff51b540dc6c8341 (diff) | |
| download | chromium_src-363a670b98140a1b7a65e490decc494aa8960344.zip chromium_src-363a670b98140a1b7a65e490decc494aa8960344.tar.gz chromium_src-363a670b98140a1b7a65e490decc494aa8960344.tar.bz2 | |
Revert "Allow suppressed EME canPlayType() responses to be overridden with a flag." (r208096).
Broke ChromeOS build.
TBR=ddorwin
Review URL: https://codereview.chromium.org/16917014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_switches.cc | 4 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 153c22a..b1f6279 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -21,10 +21,6 @@ const char kEnableVp8AlphaPlayback[] = "enable-vp8-alpha-playback"; // Set number of threads to use for video decoding. const char kVideoThreads[] = "video-threads"; -// Override suppressed responses to canPlayType(). -const char kOverrideEncryptedMediaCanPlayType[] = - "override-encrypted-media-canplaytype"; - #if defined(GOOGLE_TV) // Use external video surface for video with more than or equal pixels to // specified value. For example, value of 0 will enable external video surface diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 0462ada..08fdd37 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -22,8 +22,6 @@ MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[]; MEDIA_EXPORT extern const char kVideoThreads[]; -MEDIA_EXPORT extern const char kOverrideEncryptedMediaCanPlayType[]; - #if defined(GOOGLE_TV) MEDIA_EXPORT extern const char kUseExternalVideoSurfaceThresholdInPixels[]; #endif |