chrome/browser/media_galleries/fileapi/supported_audio_video_checker.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/supported_audio_video_checker.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/media_galleries/fileapi/media_path_filter.cc ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc » ('j') | content/common/mime_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6efb849db3b8938f200fdd0c9f26a2523fb78e66..ca398d1bf8dbf2f33576cea04e5af7e0dde09cda 100644

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

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

@@ -15,6 +15,7 @@

#include "base/stl_util.h"

#include "chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h"

#include "content/public/browser/browser_thread.h"

+#include "media/base/mime_util.h"

#include "net/base/mime_util.h"

namespace {

@@ -28,12 +29,12 @@ class SupportedAudioVideoExtensions {

for (size_t i = 0; i < extensions.size(); ++i) {

std::string mime_type;

if (net::GetWellKnownMimeTypeFromExtension(extensions[i], &mime_type) &&

- net::IsSupportedMimeType(mime_type)) {

+ media::IsSupportedMediaMimeType(mime_type)) {

audio_video_extensions_.insert(

base::FilePath::kExtensionSeparator + extensions[i]);

}

- };

+ }

bool HasSupportedAudioVideoExtension(const base::FilePath& file) {

return ContainsKey(audio_video_extensions_, file.Extension());