GN: Get os="chromeos" use_ozone=true to compile

There were a number of ozone targets that had rusted or never
been implemented in the GN build for Chrome OS. Fix it!

R=cmasone
TBR=brettw
BUG=424334
TEST=build chrome with os=chromeos use_ozone=true use_clang=true

Review URL: https://codereview.chromium.org/705623004

Cr-Commit-Position: refs/heads/master@{#302752}

15 files changed, 84 insertions, 29 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 75a7a74..628569f 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -74,6 +74,10 @@ component("ash") {
       "accelerators/magnifier_key_scroller.h",
       "accelerators/spoken_feedback_toggler.cc",
       "accelerators/spoken_feedback_toggler.h",
+      "host/ash_window_tree_host_x11.cc",
+      "host/ash_window_tree_host_x11.h",
+      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
+      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
     ]
   }
 
@@ -97,17 +101,12 @@ component("ash") {
       "system/tray/media_security/media_capture_observer.h",
       "system/tray/media_security/multi_profile_media_tray_item.cc",
       "system/tray/media_security/multi_profile_media_tray_item.h",
-      "virtual_keyboard_controller.cc",
-      "virtual_keyboard_controller.h",
-    ]
-  }
-
-  if (!use_x11 || !is_chromeos) {
-    sources -= [
       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
       "touch/touchscreen_util.cc",
       "touch/touchscreen_util.h",
+      "virtual_keyboard_controller.cc",
+      "virtual_keyboard_controller.h",
     ]
   }
 
@@ -301,6 +300,7 @@ test("ash_unittests") {
     sources -= [
       "accelerators/magnifier_key_scroller_unittest.cc",
       "accelerators/spoken_feedback_toggler_unittest.cc",
+      "host/ash_window_tree_host_x11_unittest.cc",
     ]
   }
   if (is_chromeos) {
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index ad58f06..be272ba 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -12,7 +12,7 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-if (!is_android && !is_chromeos) {
+if (!is_android && !(is_chromeos && !use_ozone)) {
 
 # TODO(GYP) for Windows need to the the reorder-imports step which probably
 # means adding another target and renaming this to chrome_initial like in GYP.
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 866a72c..4eb1b5b 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -224,6 +224,11 @@ static_library("extensions") {
         ".", "//chrome")
   }
 
+  if (is_chromeos && use_ozone) {
+    sources -= [
+      "global_shortcut_listener_chromeos.cc",
+    ]
+  }
   if (!use_ozone) {
     sources -= [
       "global_shortcut_listener_ozone.cc",
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index 4fef2ba..f050cc9 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -45,8 +45,8 @@ component("chromeos") {
     sources -= [ "ime/ime_keyboard_ozone.cc" ]
   } else {
     sources -= [
-      "ime/keyboard_controller.cc",
       "ime/ime_keyboard_x11.cc",
+      "ime/ime_keyboard_x11.h",
     ]
   }
 }
@@ -162,6 +162,11 @@ test("chromeos_unittests") {
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
+  if (use_ozone) {
+    sources -= [
+      "ime/ime_keyboard_x11_unittest.cc",
+    ]
+  }
 }
 
 proto_library("power_manager_proto") {
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 961ba08..cfe291b 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -159,6 +159,9 @@ source_set("common") {
     sources -= [
       "gpu/gpu_memory_buffer_factory_linux.cc",
     ]
+    deps += [
+      "//ui/ozone/gpu",
+    ]
   }
 
   if (!use_aura) {
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index f84918a..fc3d08d 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -129,7 +129,7 @@ source_set("app_shell_lib") {
   }
 }
 
-if (!is_chromeos) {
+if (!(is_chromeos && !use_ozone)) {
     executable("app_shell") {
     # testonly because :app_shell_lib is testonly. See :app_shell_lib comment.
     testonly = true
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 280dc3d..eb84abb 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -48,14 +48,14 @@ if (use_ozone) {
     # object MediaOzonePlatform.
     script = "../ui/ozone/generate_constructor_list.py"
 
-    platform_list_txt_file = "$target_gen_dir/ui/ozone/platform_list.txt"
-    constructor_list_cc_file = "$target_gen_dir/media/ozone/constructor_list.cc"
+    platform_list_txt_file = "$target_gen_dir/../ui/ozone/platform_list.txt"
+    constructor_list_cc_file = "$target_gen_dir/../media/ozone/constructor_list.cc"
 
     sources = [ platform_list_txt_file ]
     outputs = [ constructor_list_cc_file ]
     args = [
-      "--platform_list=$platform_list_txt_file",
-      "--output_cc=$constructor_list_cc_file",
+      "--platform_list=" + rebase_path(platform_list_txt_file, root_build_dir),
+      "--output_cc=" + rebase_path(constructor_list_cc_file, root_build_dir),
       "--namespace=media",
       "--typename=MediaOzonePlatform",
       "--include=\"media/ozone/media_ozone_platform.h\""
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 8b22fbb..733a9c2 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -115,6 +115,11 @@ component("aura") {
     deps += [
       "//ui/events/platform/x11",
     ]
+  } else {
+    sources -= [
+      "window_tree_host_x11.cc",
+      "window_tree_host_x11.h",
+    ]
   }
 
   if (is_win) {
@@ -134,11 +139,10 @@ component("aura") {
       "window_tree_host_ozone.h",
     ]
 
-    # TODO(GYP) enable when these targets exist.
-    #deps += [
-    #  "//ui/events/ozone",
-    #  "//ui/ozone",
-    #]
+    deps += [
+      "//ui/events/ozone:events_ozone",
+      "//ui/ozone",
+    ]
   }
 }
 
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 24830da..dbef91d 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -757,16 +757,6 @@ test("ui_unittests") {
       "webui/web_ui_util_unittest.cc",
       "x/selection_requestor_unittest.cc",
     ]
-
-    if (!use_x11) {
-      if (is_chromeos) {
-        # These were already removed in the chromeos case.
-        sources -= [
-          "ime/chromeos/character_composer_unittest.cc",
-          "ime/input_method_chromeos_unittest.cc",
-        ]
-      }
-    }
   }
 
   if (build_ime) {
@@ -782,6 +772,13 @@ test("ui_unittests") {
     if (use_x11) {
       sources += [ "ime/composition_text_util_pango_unittest.cc" ]
     }
+    if (!use_x11 && is_chromeos) {
+      # These were already removed in the non-chromeos case.
+      sources -= [
+        "ime/chromeos/character_composer_unittest.cc",
+        "ime/input_method_chromeos_unittest.cc",
+      ]
+    }
   }
 
   deps = [
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 9488771..2bd6ccb 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -120,4 +120,12 @@ test("display_unittests") {
       "//ui/display/types",
     ]
   }
+
+  if (use_ozone) {
+    sources -= [
+      "chromeos/x11/display_util_x11_unittest.cc",
+      "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
+    ]
+  }
+      
 }
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 1eaf2a9..958ee2a 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -323,6 +323,10 @@ test("events_unittests") {
       "ozone/evdev/event_converter_evdev_impl_unittest.cc",
       "ozone/evdev/touch_event_converter_evdev_unittest.cc",
     ]
+    deps += [
+      "//ui/events/ozone:events_ozone",
+      "//ui/events/ozone:events_ozone_evdev",
+    ]
   }
 
   if (use_aura) {
diff --git a/ui/events/ozone/BUILD.gn b/ui/events/ozone/BUILD.gn
index e1366af..5625e05 100644
--- a/ui/events/ozone/BUILD.gn
+++ b/ui/events/ozone/BUILD.gn
@@ -54,6 +54,8 @@ component("events_ozone_evdev") {
     "evdev/event_modifiers_evdev.cc",
     "evdev/event_modifiers_evdev.h",
     "evdev/events_ozone_evdev_export.h",
+    "evdev/keyboard_evdev.cc",
+    "evdev/keyboard_evdev.h",
     "evdev/touch_event_converter_evdev.cc",
     "evdev/touch_event_converter_evdev.h",
   ]
@@ -84,6 +86,8 @@ component("events_ozone_evdev") {
       "evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h",
       "evdev/libgestures_glue/gesture_logging.cc",
       "evdev/libgestures_glue/gesture_logging.h",
+      "evdev/libgestures_glue/gesture_property_provider.cc",
+      "evdev/libgestures_glue/gesture_property_provider.h",
       "evdev/libgestures_glue/gesture_timer_provider.cc",
       "evdev/libgestures_glue/gesture_timer_provider.h",
     ]
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index ac2e7cc..a01056b 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -109,6 +109,7 @@ component("ozone") {
     "//ipc",
     "//skia",
     "//ui/display/types",
+    "//ui/display/util",
     "//ui/events",
     "//ui/events/ozone:events_ozone",
     "//ui/gfx",
diff --git a/ui/ozone/gpu/BUILD.gn b/ui/ozone/gpu/BUILD.gn
new file mode 100644
index 0000000..91d38f9
--- /dev/null
+++ b/ui/ozone/gpu/BUILD.gn
@@ -0,0 +1,19 @@
+# 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.
+
+component("gpu") {
+  sources = [
+    "gpu_memory_buffer_factory_ozone_native_buffer.cc",
+    "gpu_memory_buffer_factory_ozone_native_buffer.h",
+  ]
+
+  defines = [ "OZONE_GPU_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/gl",
+  ]
+}
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index d959c56..6265d4f 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -143,6 +143,11 @@ static_library("test_support") {
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
+  if (use_ozone) {
+    sources -= [
+      "test/x11_property_change_waiter.cc",
+    ]
+  }
 }
 
 test("views_unittests") {