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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/manifest/manifest_icon_selector.h" 5 #include "chrome/browser/manifest/manifest_icon_selector.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/mime_util/mime_util.h"
10 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
11 #include "net/base/mime_util.h"
12 #include "ui/gfx/screen.h" 12 #include "ui/gfx/screen.h"
13 13
14 using content::Manifest; 14 using content::Manifest;
15 15
16 ManifestIconSelector::ManifestIconSelector(float preferred_icon_size_in_pixels) 16 ManifestIconSelector::ManifestIconSelector(float preferred_icon_size_in_pixels)
17 : preferred_icon_size_in_pixels_(preferred_icon_size_in_pixels) { 17 : preferred_icon_size_in_pixels_(preferred_icon_size_in_pixels) {
18 } 18 }
19 19
20 bool ManifestIconSelector::IconSizesContainsPreferredSize( 20 bool ManifestIconSelector::IconSizesContainsPreferredSize(
21 const std::vector<gfx::Size>& sizes) { 21 const std::vector<gfx::Size>& sizes) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 return false; 120 return false;
121 } 121 }
122 122
123 // static 123 // static
124 std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType( 124 std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(
125 const std::vector<content::Manifest::Icon>& icons) { 125 const std::vector<content::Manifest::Icon>& icons) {
126 std::vector<Manifest::Icon> result; 126 std::vector<Manifest::Icon> result;
127 127
128 for (size_t i = 0; i < icons.size(); ++i) { 128 for (size_t i = 0; i < icons.size(); ++i) {
129 if (icons[i].type.is_null() || 129 if (icons[i].type.is_null() ||
130 net::IsSupportedImageMimeType( 130 mime_util::IsSupportedImageMimeType(
131 base::UTF16ToUTF8(icons[i].type.string()))) { 131 base::UTF16ToUTF8(icons[i].type.string()))) {
132 result.push_back(icons[i]); 132 result.push_back(icons[i]);
133 } 133 }
134 } 134 }
135 135
136 return result; 136 return result;
137 } 137 }
138 138
139 // static 139 // static
140 GURL ManifestIconSelector::FindBestMatchingIcon( 140 GURL ManifestIconSelector::FindBestMatchingIcon(
141 const std::vector<Manifest::Icon>& unfiltered_icons, 141 const std::vector<Manifest::Icon>& unfiltered_icons,
142 const float preferred_icon_size_in_dp, 142 const float preferred_icon_size_in_dp,
143 const gfx::Screen* screen) { 143 const gfx::Screen* screen) {
144 const float device_scale_factor = 144 const float device_scale_factor =
145 screen->GetPrimaryDisplay().device_scale_factor(); 145 screen->GetPrimaryDisplay().device_scale_factor();
146 const float preferred_icon_size_in_pixels = 146 const float preferred_icon_size_in_pixels =
147 preferred_icon_size_in_dp * device_scale_factor; 147 preferred_icon_size_in_dp * device_scale_factor;
148 148
149 ManifestIconSelector selector(preferred_icon_size_in_pixels); 149 ManifestIconSelector selector(preferred_icon_size_in_pixels);
150 return selector.FindBestMatchingIcon(unfiltered_icons, device_scale_factor); 150 return selector.FindBestMatchingIcon(unfiltered_icons, device_scale_factor);
151 } 151 }
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698