content/browser/frame_host/navigation_controller_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/browser/frame_host/navigation_controller_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

« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | content/browser/loader/buffered_resource_handler.cc » ('j') | net/base/mime_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0658787b402b4c7cadbd9bad2d3af710b679ae4c..695d1862e503788095b79d46bd694f7f23cd2612 100644

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

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

@@ -488,8 +488,7 @@ NavigationEntryImpl* NavigationControllerImpl::GetLastCommittedEntry() const {

bool NavigationControllerImpl::CanViewSource() const {

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

- bool is_viewable_mime_type = net::IsSupportedNonImageMimeType(mime_type) &&

- !net::IsSupportedMediaMimeType(mime_type);

+ bool is_viewable_mime_type = net::IsSupportedNonImageMimeType(mime_type);

NavigationEntry* visible_entry = GetVisibleEntry();

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

is_viewable_mime_type && !delegate_->GetInterstitialPage();