Index: chrome/browser/extensions/extension_install_prompt.cc |
=================================================================== |
--- chrome/browser/extensions/extension_install_prompt.cc (revision 168086) |
+++ chrome/browser/extensions/extension_install_prompt.cc (working copy) |
@@ -104,16 +104,26 @@ |
// Returns pixel size under maximal scale factor for the icon whose device |
// independent size is |size_in_dip| |
int GetSizeForMaxScaleFactor(int size_in_dip) { |
- float max_scale_factor_scale = |
- ui::GetScaleFactorScale(ui::GetMaxScaleFactor()); |
+ std::vector<ui::ScaleFactor> supported_scale_factors = |
+ ui::GetSupportedScaleFactors(); |
+ // Scale factors are in ascending order, so the last one is the one we need. |
+ ui::ScaleFactor max_scale_factor = supported_scale_factors.back(); |
+ float max_scale_factor_scale = ui::GetScaleFactorScale(max_scale_factor); |
+ |
return static_cast<int>(size_in_dip * max_scale_factor_scale); |
} |
// Returns bitmap for the default icon with size equal to the default icon's |
// pixel size under maximal supported scale factor. |
SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) { |
+ std::vector<ui::ScaleFactor> supported_scale_factors = |
+ ui::GetSupportedScaleFactors(); |
+ // Scale factors are in ascending order, so the last one is the one we need. |
+ ui::ScaleFactor max_scale_factor = |
+ supported_scale_factors[supported_scale_factors.size() - 1]; |
+ |
return Extension::GetDefaultIcon(is_app). |
- GetRepresentation(ui::GetMaxScaleFactor()).sk_bitmap(); |
+ GetRepresentation(max_scale_factor).sk_bitmap(); |
} |
// If auto confirm is enabled then posts a task to proceed with or cancel the |