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

Unified Diff: ui/base/layout.cc

Issue 672673005: Remove IsHighDPIEnabled, move EnableHighDPISupport to only place it's used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-5
Patch Set: rebase-6 Created 6 years, 2 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 | « chrome/app/chrome_exe_main_win.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index f6362ac94830b8dc39735e64f09573ef6bfbfa4a..0c3802b751b554527f0053af5f6f453b5ea797dc 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -84,10 +84,10 @@ ScaleFactor GetSupportedScaleFactor(float scale) {
float GetImageScale(ScaleFactor scale_factor) {
#if defined(OS_WIN)
- if (gfx::IsHighDPIEnabled())
- return gfx::GetDPIScale();
-#endif
+ return gfx::GetDPIScale();
+#else
return GetScaleForScaleFactor(scale_factor);
+#endif
}
float GetScaleForScaleFactor(ScaleFactor scale_factor) {
« no previous file with comments | « chrome/app/chrome_exe_main_win.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698