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

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

Issue 23498059: Remove last dependencies on ui/base from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last rebase Created 7 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
« no previous file with comments | « ui/aura/test/test_aura_initializer.cc ('k') | ui/base/win/dpi_setup.h » ('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 8d2815db437f6bba95bc60d82c83f444ae8d5ac1..761aab83cd5e86a1f866a59659610191cd3294e8 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -41,6 +41,7 @@
#endif
#if defined(OS_WIN)
+#include "ui/base/win/dpi_setup.h"
#include "ui/gfx/win/dpi.h"
#endif
@@ -562,6 +563,7 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
if (base::mac::IsOSLionOrLater())
supported_scale_factors.push_back(SCALE_FACTOR_200P);
#elif defined(OS_WIN)
+ ui::win::InitDeviceScaleFactor();
// Have high-DPI resources for 140% and 180% scaling on Windows based on
// default scaling for Metro mode. Round to nearest supported scale in
// all cases.
« no previous file with comments | « ui/aura/test/test_aura_initializer.cc ('k') | ui/base/win/dpi_setup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698