Index: ui/android/window_android.cc |
diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc |
index 5fe7779a2716b142c9818f9a3b8dde01d9d0cd9e..0892bafa0651ad2f3630b7d59cf4cbd8902ff7be 100644 |
--- a/ui/android/window_android.cc |
+++ b/ui/android/window_android.cc |
@@ -12,6 +12,7 @@ |
#include "jni/WindowAndroid_jni.h" |
#include "ui/android/window_android_compositor.h" |
#include "ui/android/window_android_observer.h" |
+#include "ui/gfx/android/device_display_info.h" |
namespace ui { |
@@ -20,6 +21,9 @@ using base::android::ScopedJavaLocalRef; |
WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) { |
java_window_.Reset(env, obj); |
+ // TODO(gsennton) have our device display info depend on our (java) display |
+ // context |
+ device_display_info_ = make_scoped_ptr(new gfx::DeviceDisplayInfo()); |
} |
void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { |
@@ -132,6 +136,10 @@ bool WindowAndroid::CanRequestPermission(const std::string& permission) { |
base::android::ConvertUTF8ToJavaString(env, permission).obj()); |
} |
+const gfx::DeviceDisplayInfo& WindowAndroid::GetDeviceDisplayInfo() { |
+ return *device_display_info_; |
+} |
+ |
// ---------------------------------------------------------------------------- |
// Native JNI methods |
// ---------------------------------------------------------------------------- |