| 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..d21448e4901d541d20a7379f53dcd75e097e6575 100644
|
| --- a/ui/android/display_android_manager.cc
|
| +++ b/ui/android/display_android_manager.cc
|
| @@ -39,11 +39,8 @@ DisplayAndroidManager::DisplayAndroidManager() {}
|
|
|
| DisplayAndroidManager::~DisplayAndroidManager() {}
|
|
|
| -// Screen interface.
|
| -
|
| -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 +51,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 {
|
|
|