| 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
|
| }
|
|
|
|
|