Index: content/child/simple_webmimeregistry_impl.cc |
diff --git a/content/child/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc |
index e7416d92041d5443c2cd4782704a549fa4fbb99e..ef9eff852f84e7b439ef444f1e9184769b9799fe 100644 |
--- a/content/child/simple_webmimeregistry_impl.cc |
+++ b/content/child/simple_webmimeregistry_impl.cc |
@@ -8,6 +8,7 @@ |
#include "base/strings/string_util.h" |
#include "base/strings/sys_string_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "media/base/mime_util.h" |
#include "net/base/mime_util.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
@@ -69,7 +70,8 @@ bool SimpleWebMimeRegistryImpl::supportsEncryptedMediaMIMEType( |
WebMimeRegistry::SupportsType |
SimpleWebMimeRegistryImpl::supportsNonImageMIMEType( |
const WebString& mime_type) { |
- return net::IsSupportedNonImageMimeType(ToASCIIOrEmpty(mime_type)) ? |
+ return (net::IsSupportedNonImageMimeType(ToASCIIOrEmpty(mime_type)) |
+ || media::IsSupportedMediaMimeType(ToASCIIOrEmpty(mime_type))) ? |
acolwell GONE FROM CHROMIUM
2014/07/17 23:19:31
Now that the media types aren't in the non-image m
|
WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported; |
} |