chrome/browser/manifest/manifest_icon_selector.cc - Issue 1110833003: Move the IsSupported* mime functions out of //net and into //components/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: chrome/browser/manifest/manifest_icon_selector.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/download/download_target_determiner.cc ('k') | chrome/browser/media_galleries/fileapi/media_path_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/manifest/manifest_icon_selector.cc

diff --git a/chrome/browser/manifest/manifest_icon_selector.cc b/chrome/browser/manifest/manifest_icon_selector.cc

index 32d2b9c691a9e43b724e8e17a44dfbed9226abcb..7e3bd1f900508d23abdba6ff4efb41443fff4285 100644

--- a/chrome/browser/manifest/manifest_icon_selector.cc

+++ b/chrome/browser/manifest/manifest_icon_selector.cc

@@ -7,8 +7,8 @@

#include <limits>

#include "base/strings/utf_string_conversions.h"

+#include "components/mime_util/mime_util.h"

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

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

#include "ui/gfx/screen.h"

using content::Manifest;

@@ -127,7 +127,7 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(

for (size_t i = 0; i < icons.size(); ++i) {

if (icons[i].type.is_null() ||

- net::IsSupportedImageMimeType(

+ mime_util::IsSupportedImageMimeType(

base::UTF16ToUTF8(icons[i].type.string()))) {

result.push_back(icons[i]);

}