Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(901)

Unified Diff: content/browser/web_contents/web_contents_view_android.cc

Issue 2688413007: Add display::GetDisplayNearestView (Closed)
Patch Set: add missing files Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index eed15aa9d3d3221af5a8ee13ab78e681e0e9bdf6..ed7e60cfdcbb44c1d4dcf68ac67f3ae8ecd1f345 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -156,9 +156,11 @@ 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);
}

Powered by Google App Engine
This is Rietveld 408576698