Index: ui/android/window_android.h |
diff --git a/ui/android/window_android.h b/ui/android/window_android.h |
index a69a1ddda4e557aac803c640999c422aa3cace4e..c54520f109d9cc99eff0b43e919afb36a716af5d 100644 |
--- a/ui/android/window_android.h |
+++ b/ui/android/window_android.h |
@@ -6,6 +6,7 @@ |
#define UI_ANDROID_WINDOW_ANDROID_H_ |
#include <jni.h> |
+#include <memory> |
#include <vector> |
#include "base/android/jni_weak_ref.h" |
@@ -13,6 +14,7 @@ |
#include "base/observer_list.h" |
#include "base/time/time.h" |
#include "ui/android/ui_android_export.h" |
+#include "ui/gfx/android/device_display_info.h" |
#include "ui/gfx/geometry/vector2d_f.h" |
namespace ui { |
@@ -63,14 +65,21 @@ class UI_ANDROID_EXPORT WindowAndroid { |
void OnActivityPaused(JNIEnv* env, jobject obj); |
void OnActivityResumed(JNIEnv* env, jobject obj); |
+ std::shared_ptr<gfx::DeviceDisplayInfo> GetDeviceDisplayInfo(); |
jdduke (slow)
2015/06/16 15:01:28
I'd prefer this not be a shared reference. Can we
gsennton
2015/06/17 11:40:36
Done.
|
+ void UpdateDeviceDisplayInfo(); |
+ |
private: |
~WindowAndroid(); |
+ // TODO ScopedJavaLocalRef ok? |
+ base::android::ScopedJavaLocalRef<jobject> GetJavaContext(); |
+ |
base::android::ScopedJavaGlobalRef<jobject> java_window_; |
gfx::Vector2dF content_offset_; |
WindowAndroidCompositor* compositor_; |
base::ObserverList<WindowAndroidObserver> observer_list_; |
+ std::shared_ptr<gfx::DeviceDisplayInfo> device_display_info_; |
DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
}; |