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

Unified Diff: ash/display/display_manager.cc

Issue 578553002: Use DSF instead of UI scale if the native DSF is 1.25 and UI Scale is 0.8x (dsf=1.25 equivalent) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 29eced4cc03ec6eee89c4e70a04ad674edb7a05b..3a02c4a2f24ae09761c3f28387e3f35d3d58a321 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -252,6 +252,7 @@ bool DisplayManager::InitFromCommandLine() {
for (vector<string>::const_iterator iter = parts.begin();
iter != parts.end(); ++iter) {
info_list.push_back(DisplayInfo::CreateFromSpec(*iter));
+ info_list.back().set_native(true);
}
MaybeInitInternalDisplay(info_list[0].id());
if (info_list.size() > 1 &&
@@ -265,6 +266,7 @@ bool DisplayManager::InitFromCommandLine() {
void DisplayManager::InitDefaultDisplay() {
DisplayInfoList info_list;
info_list.push_back(DisplayInfo::CreateFromSpec(std::string()));
+ info_list.back().set_native(true);
MaybeInitInternalDisplay(info_list[0].id());
OnNativeDisplaysChanged(info_list);
}
@@ -276,7 +278,7 @@ void DisplayManager::InitFontParams() {
const DisplayInfo& display_info =
GetDisplayInfo(gfx::Display::InternalDisplayId());
gfx::SetFontRenderParamsDeviceScaleFactor(
- display_info.device_scale_factor());
+ display_info.GetEffectiveDeviceScaleFactor());
#endif // OS_CHROMEOS
}

Powered by Google App Engine
This is Rietveld 408576698