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

ui/display/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
+import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
 component("display") {
   sources = [
-    "android/screen_android.cc",
     "chromeos/apply_content_protection_task.cc",
     "chromeos/apply_content_protection_task.h",
     "chromeos/configure_displays_task.cc",
     "chromeos/configure_displays_task.h",
     "chromeos/display_configurator.cc",
     "chromeos/display_configurator.h",
     "chromeos/display_layout_manager.h",
     "chromeos/display_snapshot_virtual.cc",
     "chromeos/display_snapshot_virtual.h",
     "chromeos/display_util.cc",
@@ skipping 41 matching lines @@
     "win/dpi.cc",
     "win/dpi.h",
     "win/scaling_util.cc",
     "win/scaling_util.h",
     "win/screen_win.cc",
     "win/screen_win.h",
     "win/screen_win_display.cc",
     "win/screen_win_display.h",
   ]
 
+  if (is_android && !use_aura) {

[boliu, 2016/10/27 22:17:49]

aura + android isn't a thing anymore, and android directory stuff should already
be only be included on android, so don't need this conditional

[Tima Vaisburd, 2016/10/31 23:36:15]

display_android_manager.{cc,h} are included unconditionally,
jni_registrar.{cc,h} are removed altogether.

+    sources += [
+      "android/display_android_manager.cc",
+      "android/display_android_manager.h",
+      "android/jni_registrar.cc",
+      "android/jni_registrar.h",
+    ]
+  }
+
   defines = [ "DISPLAY_IMPLEMENTATION" ]
 
   public_deps = [
     "//ui/gfx:gfx",
   ]
 
   deps = [
     "//base",
     "//third_party/re2",
     "//ui/display/types",
     "//ui/display/util",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
+  if (is_android) {
+    deps += [ ":display_jni_headers" ]
+  }
+
   if (is_chromeos && use_x11) {
     sources += [
       "chromeos/x11/display_mode_x11.cc",
       "chromeos/x11/display_mode_x11.h",
       "chromeos/x11/display_snapshot_x11.cc",
       "chromeos/x11/display_snapshot_x11.h",
       "chromeos/x11/display_util_x11.cc",
       "chromeos/x11/display_util_x11.h",
       "chromeos/x11/native_display_delegate_x11.cc",
       "chromeos/x11/native_display_delegate_x11.h",
@@ skipping 11 matching lines @@
     deps += [ "//ui/events/platform" ]
   }
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 
   if (!use_aura) {
     sources -= [ "screen_aura.cc" ]
   }
-  if (is_android && use_aura) {
-    sources -= [ "android/screen_android.cc" ]
-  }
+
   if (is_mac) {
     libs = [
       "AppKit.framework",
       "CoreGraphics.framework",
     ]
   }
 }
 
+generate_jni("display_jni_headers") {
+  sources = [
+    "../../ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java",

[Tima Vaisburd, 2016/10/27 07:55:58]

The path that start with ".." is probably bad, shall we move DisplayAndroid.java
and DisplayAndroidManager.java under ui/display/android ?

[mthiesse, 2016/10/27 14:30:30]

Do you mean to
ui/display/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java?

I don't think we can move java source out of a java/src folder.

[Tima Vaisburd, 2016/10/27 17:56:24]

I guess we could repeat the hierarchy under this ui/display/android, but I did
not try.

+  ]
+  jni_package = "display"
+}
+
 static_library("test_support") {
   testonly = true
   sources = [
     "chromeos/test/action_logger.cc",
     "chromeos/test/action_logger.h",
     "chromeos/test/action_logger_util.cc",
     "chromeos/test/action_logger_util.h",
     "chromeos/test/test_display_layout_manager.cc",
     "chromeos/test/test_display_layout_manager.h",
     "chromeos/test/test_native_display_delegate.cc",
@@ skipping 69 matching lines @@
     sources -= [ "display_change_notifier_unittest.cc" ]
   }
 
   if (is_chromeos && use_ozone) {
     sources -= [
       "chromeos/x11/display_util_x11_unittest.cc",
       "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
     ]
   }
 }