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

Unified Diff: ui/base/layout.cc

Issue 11953054: Fix high-DPI on Windows to make use of DIP scaling in WebKit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code cleanup. Created 7 years, 11 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: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 367dde33be2c539c9ecc1ac23f5939f18c2f79ce..5435863945e007df9a57ef5fcad97614a4dd896b 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -90,10 +90,8 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {
if (base::mac::IsOSLionOrLater())
supported_scale_factors->push_back(SCALE_FACTOR_200P);
#elif defined(OS_WIN) && defined(ENABLE_HIDPI)
- if (base::win::IsMetroProcess() && base::win::IsTouchEnabled()) {
- supported_scale_factors->push_back(SCALE_FACTOR_140P);
- supported_scale_factors->push_back(SCALE_FACTOR_180P);
- }
+ supported_scale_factors->push_back(SCALE_FACTOR_140P);
+ supported_scale_factors->push_back(SCALE_FACTOR_180P);
#elif defined(OS_CHROMEOS)
// TODO(oshima): Include 200P only if the device support 200P
supported_scale_factors->push_back(SCALE_FACTOR_200P);

Powered by Google App Engine
This is Rietveld 408576698