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

Unified Diff: ui/android/window_android.cc

Issue 1144333004: Make WebView work for external displays (over Presentations). Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix another context-use through making WindowAndroid::GetJavaContext public Created 5 years, 5 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 5f5b9731aee2d8ab73e22abf28a24314a98dd73f..a6abd3dff0ab4a78d54628c9fd2e57af107f71de 100644
--- a/ui/android/window_android.cc
+++ b/ui/android/window_android.cc
@@ -130,6 +130,23 @@ 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>(
+ new gfx::DeviceDisplayInfo(GetJavaContext()));
+}
+
+base::android::ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaContext() {
+ JNIEnv* env = AttachCurrentThread();
+ return Java_WindowAndroid_getDisplayContext(env, GetJavaObject().obj());
+}
+
// ----------------------------------------------------------------------------
// Native JNI methods
// ----------------------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698