| 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 faae55d8a15c2e13b640e240265afe69e41ad8bd..139511b750e1cf8c17314f8a5ee703b02105c065 100644
|
| --- a/chrome/browser/manifest/manifest_icon_selector.cc
|
| +++ b/chrome/browser/manifest/manifest_icon_selector.cc
|
| @@ -13,8 +13,6 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "components/mime_util/mime_util.h"
|
| #include "content/public/browser/web_contents.h"
|
| -#include "ui/display/display.h"
|
| -#include "ui/display/screen.h"
|
|
|
| using content::Manifest;
|
|
|
| @@ -130,14 +128,9 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(
|
| // static
|
| GURL ManifestIconSelector::FindBestMatchingIcon(
|
| const std::vector<Manifest::Icon>& unfiltered_icons,
|
| - const int ideal_icon_size_in_dp,
|
| - const int minimum_icon_size_in_dp) {
|
| - DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
|
| -
|
| - const int ideal_icon_size_in_px =
|
| - ConvertIconSizeFromDpToPx(ideal_icon_size_in_dp);
|
| - const int minimum_icon_size_in_px =
|
| - ConvertIconSizeFromDpToPx(minimum_icon_size_in_dp);
|
| + const int ideal_icon_size_in_px,
|
| + const int minimum_icon_size_in_px) {
|
| + DCHECK(minimum_icon_size_in_px <= ideal_icon_size_in_px);
|
|
|
| std::vector<Manifest::Icon> icons =
|
| ManifestIconSelector::FilterIconsByType(unfiltered_icons);
|
| @@ -149,10 +142,3 @@ GURL ManifestIconSelector::FindBestMatchingIcon(
|
| return GURL();
|
| return icons[index].src;
|
| }
|
| -
|
| -// static
|
| -int ManifestIconSelector::ConvertIconSizeFromDpToPx(int icon_size_in_dp) {
|
| - return static_cast<int>(round(
|
| - icon_size_in_dp *
|
| - display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
|
| -}
|
|
|