| Index: ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
|
| index dabb468983aa8e19a23b3e5ce859786048a0485c..30fb1386d573875a4559b6026480020d667f469e 100644
|
| --- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
|
| +++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
|
| @@ -30,6 +30,7 @@ import org.chromium.base.VisibleForTesting;
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
| import org.chromium.ui.VSyncMonitor;
|
| +import org.chromium.ui.display.DisplayAndroid;
|
| import org.chromium.ui.widget.Toast;
|
|
|
| import java.lang.ref.WeakReference;
|
| @@ -71,6 +72,7 @@ public class WindowAndroid {
|
| // Native pointer to the c++ WindowAndroid object.
|
| private long mNativeWindowAndroid = 0;
|
| private final VSyncMonitor mVSyncMonitor;
|
| + private final DisplayAndroid mDisplayAndroid;
|
|
|
| // A string used as a key to store intent errors in a bundle
|
| static final String WINDOW_CALLBACK_ERRORS = "window_callback_errors";
|
| @@ -175,6 +177,7 @@ public class WindowAndroid {
|
| mVSyncMonitor = new VSyncMonitor(context, mVSyncListener);
|
| mAccessibilityManager = (AccessibilityManager) mApplicationContext.getSystemService(
|
| Context.ACCESSIBILITY_SERVICE);
|
| + mDisplayAndroid = DisplayAndroid.get(context);
|
| }
|
|
|
| @CalledByNative
|
| @@ -392,6 +395,13 @@ public class WindowAndroid {
|
| }
|
|
|
| /**
|
| + * @return DisplayAndroid instance belong to this window.
|
| + */
|
| + public DisplayAndroid getDisplay() {
|
| + return mDisplayAndroid;
|
| + }
|
| +
|
| + /**
|
| * @return A reference to owning Activity. The returned WeakReference will never be null, but
|
| * the contained Activity can be null (either if it has been garbage collected or if
|
| * this is in the context of a WebView that was not created using an Activity).
|
|
|