Reland "Add display::GetDisplayNearestView"

ui/android/display_android_manager.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/android/display_android_manager.h"
 
 #include <jni.h>
 #include <map>
 
 #include "base/android/jni_android.h"
@@ skipping 24 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 DisplayAndroidManager::DisplayAndroidManager() {}
 
 DisplayAndroidManager::~DisplayAndroidManager() {}
 
 // Screen interface.
 
 Display DisplayAndroidManager::GetDisplayNearestWindow(
-    gfx::NativeView view) const {
-  ui::WindowAndroid* window = view ? view->GetWindowAndroid() : nullptr;
+    gfx::NativeWindow window) const {
   if (window) {
     DisplayList::Displays::const_iterator it =
         display_list().FindDisplayById(window->display_id());
     if (it != display_list().displays().end()) {
       return *it;
     }
   }
   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.
 Display DisplayAndroidManager::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   NOTIMPLEMENTED();
   return GetPrimaryDisplay();
 }
 
 // There is no notion of relative display positions on Android.
 Display DisplayAndroidManager::GetDisplayMatching(
     const gfx::Rect& match_rect) const {
@@ skipping 45 matching lines @@
 }
 
 void DisplayAndroidManager::SetPrimaryDisplayId(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobject,
     jint sdkDisplayId) {
   primary_display_id_ = sdkDisplayId;
 }
 
 }  // namespace ui