| Index: ui/android/display_android_manager.cc
|
| diff --git a/ui/android/display_android_manager.cc b/ui/android/display_android_manager.cc
|
| index 50e5552f3b98e3db54ffb058197d496c51b3e216..11fb9764739ad2473c9164c9fa5062d5c95f5edf 100644
|
| --- a/ui/android/display_android_manager.cc
|
| +++ b/ui/android/display_android_manager.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/stl_util.h"
|
| #include "jni/DisplayAndroidManager_jni.h"
|
| #include "ui/android/screen_android.h"
|
| +#include "ui/android/view_android.h"
|
| #include "ui/android/window_android.h"
|
| #include "ui/display/display.h"
|
|
|
| @@ -39,11 +40,13 @@ DisplayAndroidManager::DisplayAndroidManager() {}
|
|
|
| DisplayAndroidManager::~DisplayAndroidManager() {}
|
|
|
| -// Screen interface.
|
| +// static
|
| +DisplayAndroidManager* DisplayAndroidManager::GetInstance() {
|
| + return static_cast<DisplayAndroidManager*>(display::Screen::GetScreen());
|
| +}
|
|
|
| -Display DisplayAndroidManager::GetDisplayNearestWindow(
|
| - gfx::NativeView view) const {
|
| - ui::WindowAndroid* window = view ? view->GetWindowAndroid() : nullptr;
|
| +Display DisplayAndroidManager::GetDisplayNearestWindowAndroid(
|
| + gfx::NativeWindow window) const {
|
| if (window) {
|
| DisplayList::Displays::const_iterator it =
|
| display_list().FindDisplayById(window->display_id());
|
| @@ -54,6 +57,14 @@ Display DisplayAndroidManager::GetDisplayNearestWindow(
|
| return GetPrimaryDisplay();
|
| }
|
|
|
| +// Screen interface.
|
| +
|
| +Display DisplayAndroidManager::GetDisplayNearestWindow(
|
| + gfx::NativeView view) const {
|
| + ui::WindowAndroid* window = view ? view->GetWindowAndroid() : nullptr;
|
| + return GetDisplayNearestWindowAndroid(window);
|
| +}
|
| +
|
| // There is no notion of relative display positions on Android.
|
| Display DisplayAndroidManager::GetDisplayNearestPoint(
|
| const gfx::Point& point) const {
|
|
|