Index: ui/android/window_android.cc |
diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc |
index 5f5b9731aee2d8ab73e22abf28a24314a98dd73f..c9b06e0570ed149fdc7191e48c911172db2d7d3d 100644 |
--- a/ui/android/window_android.cc |
+++ b/ui/android/window_android.cc |
@@ -130,6 +130,24 @@ bool WindowAndroid::CanRequestPermission(const std::string& permission) { |
base::android::ConvertUTF8ToJavaString(env, permission).obj()); |
} |
+const gfx::DeviceDisplayInfo& WindowAndroid::GetDeviceDisplayInfo() { |
+ if (!device_display_info_) { |
+ UpdateDeviceDisplayInfo(); |
+ } |
+ return *device_display_info_; |
+} |
+ |
+void WindowAndroid::UpdateDeviceDisplayInfo() { |
+ device_display_info_ = scoped_ptr<gfx::DeviceDisplayInfo>( |
boliu
2015/07/15 06:38:47
make_scoped_ptr
gsennton
2015/07/15 19:26:21
Done.
|
+ new gfx::DeviceDisplayInfo(GetJavaDisplayContext())); |
+} |
+ |
+base::android::ScopedJavaLocalRef<jobject> |
+WindowAndroid::GetJavaDisplayContext() { |
+ JNIEnv* env = AttachCurrentThread(); |
+ return Java_WindowAndroid_getDisplayContext(env, GetJavaObject().obj()); |
+} |
+ |
// ---------------------------------------------------------------------------- |
// Native JNI methods |
// ---------------------------------------------------------------------------- |