| Index: ui/android/display_android_manager.cc
|
| diff --git a/ui/android/display_android_manager.cc b/ui/android/display_android_manager.cc
|
| index af0bae94a854886b42e981cab32cfe70f70e5c69..5e467c6877ae9cb6aa2f4e523739d5a2cfc9bb42 100644
|
| --- a/ui/android/display_android_manager.cc
|
| +++ b/ui/android/display_android_manager.cc
|
| @@ -42,7 +42,8 @@
|
| // Screen interface.
|
|
|
| Display DisplayAndroidManager::GetDisplayNearestWindow(
|
| - gfx::NativeWindow window) const {
|
| + gfx::NativeView view) const {
|
| + ui::WindowAndroid* window = view ? view->GetWindowAndroid() : nullptr;
|
| if (window) {
|
| DisplayList::Displays::const_iterator it =
|
| display_list().FindDisplayById(window->display_id());
|
| @@ -51,11 +52,6 @@
|
| }
|
| }
|
| return GetPrimaryDisplay();
|
| -}
|
| -
|
| -Display DisplayAndroidManager::GetDisplayNearestView(
|
| - gfx::NativeView view) const {
|
| - return GetDisplayNearestWindow(view ? view->GetWindowAndroid() : nullptr);
|
| }
|
|
|
| // There is no notion of relative display positions on Android.
|
|
|