content/child/blink_platform_impl.cc - Issue 877323009: Extracted media mime type checks from net/base/ into media/base/

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/blink_platform_impl.cc

Issue 877323009: Extracted media mime type checks from net/base/ into media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fixes #1 Created 5 years, 10 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/child/blink_platform_impl.cc

diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc

index ffea5f9f7bde53e696c9a04c8c913286d074d3a8..b2939e372f636d5811626a792c24dfc0b6fd5a0f 100644

--- a/content/child/blink_platform_impl.cc

+++ b/content/child/blink_platform_impl.cc

@@ -45,9 +45,9 @@

#include "content/child/websocket_bridge.h"

#include "content/child/webthread_impl.h"

#include "content/child/worker_task_runner.h"

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

#include "content/public/common/content_client.h"

#include "net/base/data_url.h"

-#include "net/base/mime_util.h"

#include "net/base/net_errors.h"

#include "net/base/net_util.h"

#include "third_party/WebKit/public/platform/WebConvertableToTraceFormat.h"

@@ -477,7 +477,7 @@ WebData BlinkPlatformImpl::parseDataURL(const WebURL& url,

WebString& charset_out) {

std::string mime_type, char_set, data;

if (net::DataURL::Parse(url, &mime_type, &char_set, &data)

- && net::IsSupportedMimeType(mime_type)) {

+ && content::IsSupportedMimeType(mime_type)) {

mimetype_out = WebString::fromUTF8(mime_type);

charset_out = WebString::fromUTF8(char_set);

return data;

« no previous file with comments | « content/child/assert_matching_enums.cc ('k') | content/child/simple_webmimeregistry_impl.cc » ('j') | net/base/mime_util.cc » ('J')