Reland of Android: support multiple displays on C++ side

content/browser/web_contents/web_contents_view_android.cc

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 8a55bfe3d7c88ff906f1b8f916ace33ca861320c..52b0ede477284f03feebeef9d37527e6103100c2 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -29,10 +29,8 @@ using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
-// static
-void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
-  const display::Display& display =
-      display::Screen::GetScreen()->GetPrimaryDisplay();
+namespace {
+void DisplayToScreenInfo(const display::Display& display, ScreenInfo* results) {

[boliu, 2016/11/14 15:48:53]

fwiw, changes in this file seem independent, could pull it out into separate CL?

[Tima Vaisburd, 2016/11/14 20:11:08]

Yes, created https://codereview.chromium.org/2499173002

   results->rect = display.bounds();
   // TODO(husky): Remove any system controls from availableRect.
   results->available_rect = display.work_area();
@@ -45,6 +43,13 @@ void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
   results->depth_per_component = display.depth_per_component();
   results->is_monochrome = display.is_monochrome();
 }
+}
+
+// static
+void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
+  DisplayToScreenInfo(display::Screen::GetScreen()->GetPrimaryDisplay(),
+                      results);
+}
 
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
@@ -107,8 +112,14 @@ gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const {
 }
 
 void WebContentsViewAndroid::GetScreenInfo(ScreenInfo* result) const {
-  // ScreenInfo isn't tied to the widget on Android. Always return the default.
-  WebContentsView::GetDefaultScreenInfo(result);
+  // Since API 17 Android supports multiple displays with different properties.
+
+  gfx::NativeView native_view = GetNativeView();
+  display::Display display =
+      native_view
+          ? display::Screen::GetScreen()->GetDisplayNearestWindow(native_view)
+          : display::Screen::GetScreen()->GetPrimaryDisplay();
+  DisplayToScreenInfo(display, result);
 }
 
 void WebContentsViewAndroid::GetContainerBounds(gfx::Rect* out) const {