Chromium Code Reviews| Index: ui/android/window_android.h |
| diff --git a/ui/android/window_android.h b/ui/android/window_android.h |
| index a69a1ddda4e557aac803c640999c422aa3cace4e..9ed08bf1b5aed2b2ff54df9d6c5449022092f4cd 100644 |
| --- a/ui/android/window_android.h |
| +++ b/ui/android/window_android.h |
| @@ -13,6 +13,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 +64,21 @@ class UI_ANDROID_EXPORT WindowAndroid { |
| void OnActivityPaused(JNIEnv* env, jobject obj); |
| void OnActivityResumed(JNIEnv* env, jobject obj); |
| + const gfx::DeviceDisplayInfo & GetDeviceDisplayInfo(); |
|
jdduke (slow)
2015/06/17 15:56:05
Nit: no space before &, this patch probably deserv
gsennton
2015/06/18 11:37:22
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_; |
| + scoped_ptr<gfx::DeviceDisplayInfo> device_display_info_; |
| DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
| }; |