content/shell/app/shell_main_delegate.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/shell/app/shell_main_delegate.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

Index: content/shell/app/shell_main_delegate.cc

diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc

index b532bf00ed8d04f5207af724b353880e80420f5a..f61d08a35d99aad436281e002e0fe47067a720db 100644

--- a/content/shell/app/shell_main_delegate.cc

+++ b/content/shell/app/shell_main_delegate.cc

@@ -23,6 +23,7 @@

#include "content/shell/browser/shell_content_browser_client.h"

#include "content/shell/common/shell_switches.h"

#include "content/shell/renderer/shell_content_renderer_client.h"

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

#include "net/cookies/cookie_monster.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

@@ -175,7 +176,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {

// Unless/until WebM files are added to the media layout tests, we need to

// avoid removing MP4/H264/AAC so that layout tests can run on Android.

#if !defined(OS_ANDROID)

- net::RemoveProprietaryMediaTypesAndCodecsForTests();

+ media::RemoveProprietaryMediaTypesAndCodecsForTests();

#endif

if (!WebKitTestPlatformInitialize()) {

« content/common/mime_util.cc ('K') | « content/shell/DEPS ('k') | media/base/mime_util.h » ('j') | no next file with comments »