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

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

Issue 2616203002: android: Remove DeviceDisplayInfo from ResourceBundle (Closed)
Patch Set: move to resource_bundle_android Created 3 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 d20272910ca6976261ea2b1038791a75c9dc82e5..d2e4c51de325a5826acf60bed572aa04649eabc9 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -44,7 +44,6 @@
#if defined(OS_ANDROID)
#include "ui/base/resource/resource_bundle_android.h"
-#include "ui/gfx/android/device_display_info.h"
#endif
#if defined(OS_CHROMEOS)
@@ -693,8 +692,7 @@ void ResourceBundle::InitSharedInstance(Delegate* delegate) {
if (display::Display::HasForceDeviceScaleFactor()) {
display_density = display::Display::GetForcedDeviceScaleFactor();
} else {
- gfx::DeviceDisplayInfo device_info;
- display_density = device_info.GetDIPScale();
+ display_density = GetPrimaryDisplayScale();
}
const ScaleFactor closest = FindClosestScaleFactorUnsafe(display_density);
if (closest != SCALE_FACTOR_100P)
« no previous file with comments | « ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java ('k') | ui/base/resource/resource_bundle_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698