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

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

Issue 11953054: Fix high-DPI on Windows to make use of DIP scaling in WebKit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code cleanup. Created 7 years, 11 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
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 9b753b09ae2dae3974359a024a4c14050184f1a2..e5f81345f4ab1ba9d353c1dc84c0674ba0e086a1 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -380,7 +380,7 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {
// ResourceBundle::GetSharedInstance() is destroyed after the
// BrowserMainLoop has finished running. |image_skia| is guaranteed to be
// destroyed before the resource bundle is destroyed.
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(ENABLE_HIDPI)
ui::ScaleFactor scale_factor_to_load = ui::GetMaxScaleFactor();
#else
ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;

Powered by Google App Engine
This is Rietveld 408576698