Commit 433c87aa authored by nancy's avatar nancy Committed by Commit Bot

Fix the icon size to resolve the icons missing issue on glinux with 2.25 factor.

BUG=990462

Change-Id: I5c7c430a742f763b9a9e350cc3ffe262fe2d0b33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1745679
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685452}
parent d9af708a
...@@ -264,7 +264,6 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression, ...@@ -264,7 +264,6 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression,
IconEffects icon_effects, IconEffects icon_effects,
apps::mojom::Publisher::LoadIconCallback callback) { apps::mojom::Publisher::LoadIconCallback callback) {
constexpr bool is_placeholder_icon = false; constexpr bool is_placeholder_icon = false;
int size_hint_in_px = apps_util::ConvertDipToPx(size_hint_in_dip);
// This is the default icon for AppType::kExtension. Other app types might // This is the default icon for AppType::kExtension. Other app types might
// use a different default icon, such as IDR_LOGO_CROSTINI_DEFAULT_192. // use a different default icon, such as IDR_LOGO_CROSTINI_DEFAULT_192.
...@@ -276,7 +275,7 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression, ...@@ -276,7 +275,7 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression,
->GetInstalledExtension(extension_id); ->GetInstalledExtension(extension_id);
if (extension) { if (extension) {
extensions::ExtensionResource ext_resource = extensions::ExtensionResource ext_resource =
extensions::IconsInfo::GetIconResource(extension, size_hint_in_px, extensions::IconsInfo::GetIconResource(extension, size_hint_in_dip,
ExtensionIconSet::MATCH_BIGGER); ExtensionIconSet::MATCH_BIGGER);
switch (icon_compression) { switch (icon_compression) {
...@@ -286,7 +285,7 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression, ...@@ -286,7 +285,7 @@ void LoadIconFromExtension(apps::mojom::IconCompression icon_compression,
case apps::mojom::IconCompression::kUncompressed: { case apps::mojom::IconCompression::kUncompressed: {
extensions::ImageLoader::Get(context)->LoadImageAsync( extensions::ImageLoader::Get(context)->LoadImageAsync(
extension, std::move(ext_resource), extension, std::move(ext_resource),
gfx::Size(size_hint_in_px, size_hint_in_px), gfx::Size(size_hint_in_dip, size_hint_in_dip),
base::BindOnce(&RunCallbackWithUncompressedImage, size_hint_in_dip, base::BindOnce(&RunCallbackWithUncompressedImage, size_hint_in_dip,
default_icon_resource, is_placeholder_icon, default_icon_resource, is_placeholder_icon,
icon_effects, std::move(callback))); icon_effects, std::move(callback)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment