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

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 672583003: remove ui/base/win/dpi_setup.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-2
Patch Set: rebase-3 Created 6 years, 2 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
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index c4d70b29841aafe3e788bd266d948da96cf61533..bae01c7b3ea4fddbe9892e170b5eeaec6f5887ca 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -46,7 +46,6 @@
#endif
#if defined(OS_WIN)
-#include "ui/base/win/dpi_setup.h"
#include "ui/gfx/win/dpi.h"
#endif
@@ -649,7 +648,7 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
// Don't initialize the device scale factor if it has already been
// initialized.
if (!gfx::win::IsDeviceScaleFactorSet())
- ui::win::InitDeviceScaleFactor();
+ gfx::InitDeviceScaleFactor(gfx::GetDPIScale());
#endif
}
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698