content/browser/frame_host/navigation_controller_impl.cc - Issue 1129643002: Moved media mime type and codec checks to media/base/mime_util.*

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/browser/frame_host/navigation_controller_impl.cc

Issue 1129643002: Moved media mime type and codec checks to media/base/mime_util.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add media dependency for mime_util in .gyp file Created 5 years, 7 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/browser/frame_host/navigation_controller_impl.cc

diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc

index 73f7b3b5533903aa32ec0203d6bfeb5a5497cf50..3e1c4b74fd3698abdfc4b7a913fb683c91eadf76 100644

--- a/content/browser/frame_host/navigation_controller_impl.cc

+++ b/content/browser/frame_host/navigation_controller_impl.cc

@@ -40,8 +40,8 @@

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

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

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

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

#include "net/base/escape.h"

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

#include "net/base/net_util.h"

#include "skia/ext/platform_canvas.h"

#include "url/url_constants.h"

@@ -496,7 +496,7 @@ bool NavigationControllerImpl::CanViewSource() const {

const std::string& mime_type = delegate_->GetContentsMimeType();

bool is_viewable_mime_type =

mime_util::IsSupportedNonImageMimeType(mime_type) &&

- !net::IsSupportedMediaMimeType(mime_type);

+ !media::IsSupportedMediaMimeType(mime_type);

NavigationEntry* visible_entry = GetVisibleEntry();

return visible_entry && !visible_entry->IsViewSourceMode() &&

is_viewable_mime_type && !delegate_->GetInterstitialPage();

« components/mime_util/mime_util.cc ('K') | « components/mime_util/mime_util.gyp ('k') | content/child/DEPS » ('j') | content/renderer/renderer_blink_platform_impl.cc » ('J')