| Index: ui/android/window_android.h
|
| diff --git a/ui/android/window_android.h b/ui/android/window_android.h
|
| index c36087b6357fdad543bc89e93c7d209ccc3fdff1..5264d009fa33ee13babc12a3baf8eded1722115b 100644
|
| --- a/ui/android/window_android.h
|
| +++ b/ui/android/window_android.h
|
| @@ -14,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 {
|
| @@ -69,6 +70,11 @@ class UI_ANDROID_EXPORT WindowAndroid {
|
| // Return whether the specified Android permission can be requested by Chrome.
|
| bool CanRequestPermission(const std::string& permission);
|
|
|
| + const gfx::DeviceDisplayInfo& GetDeviceDisplayInfo();
|
| + void UpdateDeviceDisplayInfo();
|
| +
|
| + base::android::ScopedJavaLocalRef<jobject> GetJavaDisplayContext();
|
| +
|
| private:
|
| ~WindowAndroid();
|
|
|
| @@ -77,6 +83,7 @@ class UI_ANDROID_EXPORT WindowAndroid {
|
| WindowAndroidCompositor* compositor_;
|
|
|
| base::ObserverList<WindowAndroidObserver> observer_list_;
|
| + scoped_ptr<gfx::DeviceDisplayInfo> device_display_info_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
|
| };
|
|
|