Add display::GetDisplayNearestView

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 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 "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "cc/layers/layer.h"
@@ skipping 138 matching lines @@
 }
 
 gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const {
   return content_view_core_ ? content_view_core_->GetWindowAndroid() : nullptr;
 }
 
 void WebContentsViewAndroid::GetScreenInfo(ScreenInfo* result) const {
   // Since API 17 Android supports multiple displays with different properties.
 
   gfx::NativeView native_view = GetNativeView();
+  gfx::NativeWindow native_window =
+      native_view ? native_view->GetWindowAndroid() : nullptr;
   display::Display display =
       native_view
-          ? display::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
+          ? display::Screen::GetScreen()->GetDisplayNearestWindow(native_window)
           : display::Screen::GetScreen()->GetPrimaryDisplay();
   DisplayToScreenInfo(display, result);
 }
 
 void WebContentsViewAndroid::GetContainerBounds(gfx::Rect* out) const {
   *out = content_view_core_ ? gfx::Rect(content_view_core_->GetViewSize())
                             : gfx::Rect();
 }
 
 void WebContentsViewAndroid::SetPageTitle(const base::string16& title) {
@@ skipping 217 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content