GN: Enable ui/keyboard:keyboard_unittests, fix up webui targets

This adds the ui/keyboard:keyboard_unittests target to the GN build and
adds the rest of ui/keyboard/webui/ to the build.  Since the webui bits
are the only parts that need mojo the mojo deps are restricted to that
source set.

R=sky@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#291199}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291199 0039d316-1c4b-4281-b951-d872f2087c98

ui/gl/BUILD.gn

@@ -152,6 +152,9 @@ component("gl") {
       "gl_implementation_osmesa.h",
     ]
   }
+  if (is_linux) {
+    deps += [ "//third_party/libevent" ]
+  }
   if (use_x11) {
     sources += [
       "gl_context_glx.cc",

ui/keyboard/BUILD.gn

@@ -31,8 +31,6 @@ component("keyboard") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
-    "//ipc",
-    "//skia",
     "//url",
     "//ui/aura",
     "//ui/base",
@@ -40,6 +38,7 @@ component("keyboard") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/keyboard/webui",
     "//ui/wm",
   ]
 }
@@ -71,10 +70,6 @@ copy("resources") {
   forward_dependent_configs_from = deps
 }
 
-# TODO(GYP) enable this when all dependencies are resolved. Some transitive
-# deps aren't done yet.
-if (false) {
-
 test("keyboard_unittests") {
   sources = [
     "test/run_all_unittests.cc",
@@ -101,5 +96,3 @@ test("keyboard_unittests") {
     "//url",
   ]
 }
-
-}

ui/keyboard/webui/BUILD.gn

@@ -10,3 +10,31 @@ mojom("mojo_bindings") {
     "keyboard.mojom",
   ]
 }
+
+# GYP version: part of ui/keyboard/keyboard.gyp:keyboard
+source_set("webui") {
+  visibility = "//ui/keyboard"
+
+  sources = [
+    "vk_mojo_handler.cc",
+    "vk_mojo_handler.h",
+    "vk_webui_controller.cc",
+    "vk_webui_controller.h",
+  ]
+
+  deps = [
+    ":mojo_bindings",
+    "//base",
+    "//content/public/browser",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/keyboard:resources",
+    "//mojo/public/cpp/bindings",
+    "//mojo/environment:chromium",
+    "//mojo/bindings/js",
+    "//mojo/system",
+  ]
+
+  defines = [ "KEYBOARD_IMPLEMENTATION" ]
+
+}