| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index 83aba3c0e988dc3a2829ae4cdc3ea7f7cbd52a3e..f5a592d022124b541899548087c1f2d2b5facbad 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -605,7 +605,10 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
|
| #if defined(OS_WIN)
|
| // Must be called _after_ supported scale factors are set since it
|
| // uses them.
|
| - ui::win::InitDeviceScaleFactor();
|
| + // Don't initialize the device scale factor if it has already been
|
| + // initialized.
|
| + if (!gfx::win::IsDeviceScaleFactorSet())
|
| + ui::win::InitDeviceScaleFactor();
|
| #endif
|
| }
|
|
|
|
|