chrome/browser/media_galleries/fileapi/media_path_filter.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: chrome/browser/media_galleries/fileapi/media_path_filter.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: Rebase and add content/common/mime_util.h for realz 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

« no previous file with comments | « chrome/browser/download/download_target_determiner.cc ('k') | chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc » ('j') | content/common/mime_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/fileapi/media_path_filter.cc

diff --git a/chrome/browser/media_galleries/fileapi/media_path_filter.cc b/chrome/browser/media_galleries/fileapi/media_path_filter.cc

index f94fdf6ffca95c9c3564aac9e6537f8d7cf07192..b72640ece4f56136c57f872375b6c36f26eb44e7 100644

--- a/chrome/browser/media_galleries/fileapi/media_path_filter.cc

+++ b/chrome/browser/media_galleries/fileapi/media_path_filter.cc

@@ -12,6 +12,7 @@

#include <string>

#include "base/strings/string_util.h"

+#include "content/common/mime_util.h"

#include "net/base/mime_util.h"

namespace {

@@ -79,7 +80,7 @@ const base::FilePath::CharType* const kExtraSupportedAudioExtensions[] = {

bool IsUnsupportedExtension(const base::FilePath::StringType& extension) {

std::string mime_type;

return !net::GetMimeTypeFromExtension(extension, &mime_type) ||

- !net::IsSupportedMimeType(mime_type);

+ !content::IsSupportedMimeType(mime_type);

}

std::vector<base::FilePath::StringType> GetMediaExtensionList(