Fix most of the "gn check" errors in ui/*

Some errors remain but these are circular includes that can't be fixed in the build files only.

Enable views_unittests and wm_unittests now that they compile

BUG=
R=sky@chromium.org, tfarina@chromium.org

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

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

content/public/browser/BUILD.gn

@@ -15,8 +15,6 @@ group("browser") {
 }
 
 source_set("sources") {
-  visibility = [ "//content", ":browser" ]
-
   if (is_ios) {
     # iOS doesn't get the normal file list and only takes these whitelisted
     # files.

ui/app_list/BUILD.gn

@@ -48,6 +48,7 @@ component("app_list") {
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//skia",
+    "//ui/accessibility",
     "//ui/base",
     "//ui/compositor",
     "//ui/events:events_base",
@@ -195,6 +196,8 @@ test("app_list_unittests") {
     "//testing/gtest",
     "//ui/base",
     "//ui/compositor",
+    "//ui/events",
+    "//ui/gl",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
   ]

ui/aura/BUILD.gn

@@ -225,6 +225,7 @@ executable("demo") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   if (use_x11) {
@@ -254,6 +255,7 @@ executable("bench") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   if (use_x11) {

ui/base/BUILD.gn

@@ -558,6 +558,7 @@ source_set("test_support") {
   ]
 
   deps = [
+    ":base",
     "//base",
     "//skia",
     "//testing/gtest",

ui/base/ime/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/ui.gni")
 source_set("ime") {
   # GYP version: ui/base/ime/ime.gypi, which is included into ui_base
   sources = [
+    "../ui_base_export.h",
     "candidate_window.cc",
     "candidate_window.h",
     "chromeos/character_composer.cc",

ui/compositor/BUILD.gn

@@ -58,6 +58,7 @@ component("compositor") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//cc",
+    "//cc/surfaces",
     "//gpu/command_buffer/common",
     "//skia",
     "//ui/gfx",

ui/events/BUILD.gn

@@ -72,18 +72,6 @@ component("events_base") {
 }
 
 component("events") {
-  deps = [
-    ":dom4_keycode_converter",
-    ":events_base",
-    ":gesture_detection",
-    "//base/third_party/dynamic_annotations",
-    "//skia",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-
-  defines = [ "EVENTS_IMPLEMENTATION" ]
-
   sources = [
     "cocoa/cocoa_event_utils.h",
     "cocoa/cocoa_event_utils.mm",
@@ -114,6 +102,20 @@ component("events") {
     "x/events_x.cc",
   ]
 
+  defines = [ "EVENTS_IMPLEMENTATION" ]
+
+  deps = [
+    ":dom4_keycode_converter",
+    ":events_base",
+    ":gesture_detection",
+    "//base/third_party/dynamic_annotations",
+    "//skia",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
+  forward_dependent_configs_from = [ ":events_base" ]
+
   if (use_x11) {
     configs += [
       "//build/config/linux:glib",
@@ -231,13 +233,13 @@ source_set("test_support") {
   ]
 
   deps = [
+    ":events",
+    ":events_base",
+    ":gesture_detection",
     "//base",
     "//skia",
     "//ui/events/platform",
     "//ui/gfx/geometry",
-    ":events",
-    ":events_base",
-    ":gesture_detection",
   ]
 
   if (is_ios) {

ui/events/ipc/BUILD.gn

@@ -13,6 +13,9 @@ component("ipc") {
 
   defines = [ "EVENTS_IMPLEMENTATION" ]
 
-  deps = [ "//ipc" ]
+  deps = [
+    "//ipc",
+    "//ui/events",
+  ]
 }
 

ui/events/platform/BUILD.gn

@@ -6,6 +6,9 @@ import("//build/config/ui.gni")
 
 component("platform") {
   sources = [
+    # Allow this target to include events_export.h without depending on the
+    # events target (which would be circular).
+    "../events_export.h",
     "platform_event_dispatcher.h",
     "platform_event_observer.h",
     "platform_event_source.cc",
@@ -21,7 +24,7 @@ component("platform") {
   ]
 
   deps = [
-    "//base"
+    "//base",
   ]
 
   if (use_x11) {

ui/gfx/x/BUILD.gn

@@ -7,6 +7,7 @@ component("x") {
   output_name = "gfx_x11"
 
   sources = [
+    "../gfx_export.h",
     "x11_atom_cache.cc",
     "x11_atom_cache.h",
     "x11_connection.cc",

ui/gl/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/ui.gni")
 if (is_android) {
+  import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
@@ -246,15 +247,14 @@ component("gl") {
       "gl_surface_ozone.cc",
     ]
     deps += [
-      #"//ui/gfx/ozone",
       "//ui/ozone",
+      "//ui/ozone:ozone_base",
     ]
   }
 
-  # TODO(GYP) enable this dependency once its written.
-  #if (is_android && !android_webview_build) {
-  #  deps += [ "//ui/android:ui_java" ]
-  #}
+  if (is_android && !is_android_webview_build) {
+    deps += [ "//ui/android:ui_java" ]
+  }
 }
 
 action("generate_gl_bindings") {

ui/keyboard/BUILD.gn

@@ -91,6 +91,7 @@ test("keyboard_unittests") {
     "//ui/compositor:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/resources:ui_test_pak",
     "//ui/wm",
     "//url",

ui/keyboard/webui/BUILD.gn

@@ -16,6 +16,7 @@ source_set("webui") {
   visibility = "//ui/keyboard"
 
   sources = [
+    "../keyboard_export.h",
     "vk_mojo_handler.cc",
     "vk_mojo_handler.h",
     "vk_webui_controller.cc",
@@ -26,6 +27,7 @@ source_set("webui") {
     ":mojo_bindings",
     "//base",
     "//content/public/browser",
+    "//content/public/common",
     "//ui/aura",
     "//ui/base",
     "//ui/keyboard:resources",

ui/message_center/BUILD.gn

@@ -13,7 +13,9 @@ component("message_center") {
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//skia",
+    "//ui/accessibility",
     "//ui/base",
+    "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/resources",
@@ -178,8 +180,10 @@ test("message_center_unittests") {
     "//skia",
     "//testing/gtest",
     "//ui/base",
+    "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//url",

ui/platform_window/BUILD.gn

@@ -10,4 +10,10 @@ component("platform_window") {
     "platform_window_delegate.h",
     "platform_window_export.h",
   ] 
+
+  deps = [
+    "//base",
+    "//ui/base",
+    "//ui/gfx",
+  ]
 }

ui/snapshot/BUILD.gn

@@ -69,6 +69,7 @@ test("snapshot_unittests") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   if (use_aura) {

ui/views/BUILD.gn

@@ -117,6 +117,7 @@ static_library("test_support") {
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/events",
+    "//ui/events:events_base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -135,8 +136,6 @@ static_library("test_support") {
   }
 }
 
-if (false) {  # TODO(GYP) enable once this links
-
 test("views_unittests") {
   sources = gypi_values.views_unittests_sources
 
@@ -160,6 +159,7 @@ test("views_unittests") {
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/wm",
     "//url",
   ]
@@ -201,14 +201,9 @@ test("views_unittests") {
     ]
   }
 
-  if (use_ozone) {
-    sources -= [
-      "corewm/capture_controller_unittest.cc",
-    ]
-  }
   if (use_aura) {
     sources += gypi_values.views_unittests_aura_sources
-    deps = [ "//ui/aura:test_support" ]
+    deps += [ "//ui/aura:test_support" ]
     if (!is_chromeos) {
       sources += gypi_values.views_unittests_desktop_aura_sources
     }
@@ -255,5 +250,3 @@ if (is_mac) {
     ]
   }
 }
-
-}  # if false

ui/views/controls/webview/BUILD.gn

@@ -23,8 +23,10 @@ component("webview") {
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
     "//skia",
+    "//ui/accessibility",
     "//ui/base",
     "//ui/events",
+    "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/web_dialogs",
@@ -47,6 +49,7 @@ source_set("test_support") {
     ":webview",
     "//base",
     "//content",
+    "//content/test:test_support",
     "//ipc:test_support",
     "//skia",
     "//testing/gtest",
@@ -57,6 +60,5 @@ source_set("test_support") {
     "//ui/gfx/geometry",
     "//ui/views",
     "//ui/views:test_support",
-    #'../../../../content/content_shell_and_tests.gyp:test_support_content',  TODO(GYP)
   ]
 }

ui/web_dialogs/BUILD.gn

@@ -19,7 +19,9 @@ component("web_dialogs") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
+    "//content/public/common",
     "//skia",
+    "//ui/base",
   ]
 }
 

ui/wm/BUILD.gn

@@ -96,18 +96,16 @@ static_library("test_support") {
   ]
 
   deps = [
+    ":wm",
     "//skia",
     "//ui/aura",
+    "//ui/aura:test_support",
     "//ui/base",
     "//ui/events",
     "//ui/events:events_base",
   ]
 }
 
-# TODO(GYP) enable the wm_unittests target when all dependencies have been
-# resolved. Some transitive deps aren't converted yet.
-if (false) {
-
 test("wm_unittests") {
   sources = [
     "test/run_all_unittests.cc",
@@ -141,7 +139,6 @@ test("wm_unittests") {
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 }
-
-}