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..675f0bee798ab41bf1920d054a1e002dd3a771c6 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::GetDeviceScaleFactor()) |
sky
2014/06/03 20:11:43
Wouldn't this hit the DCHECK?
ananta
2014/06/03 20:43:24
This wouldn't because the scale factor would be in
|
+ ui::win::InitDeviceScaleFactor(); |
#endif |
} |