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

Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

index efb0ceb5929f1f8d438dfe2c0c98ea08e369b0d5..45913ea724de7d621af6216b17122f9550869b4c 100644

--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

@@ -30,6 +30,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "components/metrics/proto/omnibox_event.pb.h"

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

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

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

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

@@ -578,7 +579,7 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(

tabstrip_->FileSupported(

url,

mime_type.empty() ||

- net::IsSupportedMimeType(mime_type) ||

+ content::IsSupportedMimeType(mime_type) ||

content::PluginService::GetInstance()->GetPluginInfo(

-1, // process ID

MSG_ROUTING_NONE, // routing ID