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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/base/resource/resource_bundle_win.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
« no previous file with comments | « trunk/src/ui/base/resource/resource_bundle_unittest.cc ('k') | trunk/src/ui/base/x/x11_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/base/resource/resource_bundle_win.cc
===================================================================
--- trunk/src/ui/base/resource/resource_bundle_win.cc (revision 224498)
+++ trunk/src/ui/base/resource/resource_bundle_win.cc (working copy)
@@ -44,7 +44,7 @@
// scaled up from 100% touch.
float scale = gfx::win::GetDeviceScaleFactor();
bool force_touch_resources = false;
- switch(ui::GetSupportedScaleFactor(scale)) {
+ switch(ui::GetScaleFactorFromScale(scale)) {
case ui::SCALE_FACTOR_180P:
AddDataPackFromPath(GetResourcesPakFilePath(
"chrome_touch_180_percent.pak"),
« no previous file with comments | « trunk/src/ui/base/resource/resource_bundle_unittest.cc ('k') | trunk/src/ui/base/x/x11_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698