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

Unified Diff: trunk/src/chrome/browser/extensions/extension_install_prompt.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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
Index: trunk/src/chrome/browser/extensions/extension_install_prompt.cc
===================================================================
--- trunk/src/chrome/browser/extensions/extension_install_prompt.cc (revision 224497)
+++ trunk/src/chrome/browser/extensions/extension_install_prompt.cc (working copy)
@@ -122,7 +122,9 @@
// Returns pixel size under maximal scale factor for the icon whose device
// independent size is |size_in_dip|
int GetSizeForMaxScaleFactor(int size_in_dip) {
- return static_cast<int>(size_in_dip * gfx::ImageSkia::GetMaxSupportedScale());
+ float max_scale_factor_scale =
+ ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
+ 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
@@ -131,8 +133,7 @@
const gfx::ImageSkia& image = is_app ?
extensions::IconsInfo::GetDefaultAppIcon() :
extensions::IconsInfo::GetDefaultExtensionIcon();
- return image.GetRepresentation(
- gfx::ImageSkia::GetMaxSupportedScale()).sk_bitmap();
+ return image.GetRepresentation(ui::GetMaxScaleFactor()).sk_bitmap();
}
// If auto confirm is enabled then posts a task to proceed with or cancel the

Powered by Google App Engine
This is Rietveld 408576698