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

Unified Diff: ui/android/window_android.cc

Issue 1409833004: Add DeviceDisplayInfo getter in WindowAndroid. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/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
// ----------------------------------------------------------------------------
« ui/android/window_android.h ('K') | « ui/android/window_android.h ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698