Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 1110833003: Move the IsSupported* mime functions out of //net and into //components/mime_util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 8 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/cocoa/drag_util.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 61797eb3ad736ae353cc6dfb9c8fa8a8854ae10e..0e4bb701a43070f690160b04e80ab0b4476738b8 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/url_constants.h"
#include "components/favicon/content/content_favicon_driver.h"
#include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/mime_util/mime_util.h"
#include "components/omnibox/autocomplete_match.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
@@ -581,12 +582,10 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted(
content::WebPluginInfo plugin;
tabstrip_->FileSupported(
url,
- mime_type.empty() ||
- net::IsSupportedMimeType(mime_type) ||
- content::PluginService::GetInstance()->GetPluginInfo(
- -1, // process ID
- MSG_ROUTING_NONE, // routing ID
- model_->profile()->GetResourceContext(),
- url, GURL(), mime_type, false,
- NULL, &plugin, NULL));
+ mime_type.empty() || mime_util::IsSupportedMimeType(mime_type) ||
+ content::PluginService::GetInstance()->GetPluginInfo(
+ -1, // process ID
+ MSG_ROUTING_NONE, // routing ID
+ model_->profile()->GetResourceContext(), url, GURL(), mime_type,
+ false, NULL, &plugin, NULL));
}
« no previous file with comments | « chrome/browser/ui/cocoa/drag_util.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698