| Index: ui/android/window_android.cc
|
| diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
|
| index 5f5b9731aee2d8ab73e22abf28a24314a98dd73f..afe66858d85c574ed9aac32c65ff3d379ab11d1c 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_ = make_scoped_ptr(
|
| + new gfx::DeviceDisplayInfo(GetJavaDisplayContext().obj()));
|
| +}
|
| +
|
| +base::android::ScopedJavaLocalRef<jobject>
|
| +WindowAndroid::GetJavaDisplayContext() {
|
| + JNIEnv* env = AttachCurrentThread();
|
| + return Java_WindowAndroid_getDisplayContext(env, GetJavaObject().obj());
|
| +}
|
| +
|
| // ----------------------------------------------------------------------------
|
| // Native JNI methods
|
| // ----------------------------------------------------------------------------
|
|
|