aura: Unify WindowTreeHost for some platforms

ui/aura/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("//testing/test.gni")
 
 component("aura") {
   sources = [
     "../wm/public/activation_change_observer.cc",
@@ skipping 68 matching lines @@
     "window_observer.h",
     "window_targeter.cc",
     "window_targeter.h",
     "window_tracker.cc",
     "window_tracker.h",
     "window_tree_host.cc",
     "window_tree_host.h",
     "window_tree_host_mac.h",
     "window_tree_host_mac.mm",
     "window_tree_host_observer.h",
-    "window_tree_host_win.cc",
-    "window_tree_host_win.h",
+    "window_tree_host_platform.cc",
+    "window_tree_host_platform.h",
     "window_tree_host_x11.cc",
     "window_tree_host_x11.h",
   ]
 
   defines = [ "AURA_IMPLEMENTATION" ]
 
   deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
@@ skipping 29 matching lines @@
   if (is_win) {
     sources -= [ "input_state_lookup.cc" ]
 
     deps += [
       "//ipc",
       "//ui/metro_viewer",
       "//ui/platform_window/win",
     ]
   }
 
-  if (use_ozone) {
-    sources += [
-      "window_tree_host_ozone.cc",
-      "window_tree_host_ozone.h",
+  if ((is_mac || use_x11) && !use_ozone) {

[mfomitchev, 2015/10/09 21:24:18]

(!is_win && !use_ozone && !is_android)?
IMHO better to list all platforms that need this rather than all platforms that
don't, since the set of platforms may change.

+    sources -= [
+      "window_tree_host_platform.cc",
+      "window_tree_host_platform.h",
     ]
 
     deps += [ "//ui/ozone" ]
   }
+
+  if (is_android) {
+    deps += [
+      "//ui/platform_window/android",

[mfomitchev, 2015/10/09 21:24:18]

I also had to add "//ui/platform_window/android:platform_window_java" here to
make it run, otherwise it crashed at runtime...

[no sievers, 2015/10/09 21:42:23]

oops forgot this

+    ]
+  }
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
     "test/aura_test_base.cc",
     "test/aura_test_base.h",
     "test/aura_test_helper.cc",
     "test/aura_test_helper.h",
     "test/aura_test_utils.cc",
@@ skipping 152 matching lines @@
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 
   if (is_linux) {
     deps += [ "//third_party/mesa" ]
   }
 
   data_deps = [ "//third_party/mesa:osmesa" ]
 }