content/child/simple_webmimeregistry_impl.cc - Issue 401523002: Move media related mimetype functionality out of net/ and into media/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/simple_webmimeregistry_impl.cc

Issue 401523002: Move media related mimetype functionality out of net/ and into media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/child/assert_matching_enums.cc ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;

}