Folds ui/keyboard/webui/BUILD.gn into ui/keyboard/BUILD.gn

ui/keyboard/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("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
 
 component("keyboard") {
   sources = [
     "keyboard.cc",
     "keyboard.h",
     "keyboard_constants.cc",
     "keyboard_constants.h",
     "keyboard_controller.cc",
     "keyboard_controller.h",
     "keyboard_controller_observer.h",
     "keyboard_controller_proxy.cc",
     "keyboard_controller_proxy.h",
     "keyboard_layout_manager.h",
     "keyboard_layout_manager.cc",
     "keyboard_export.h",
     "keyboard_switches.cc",
     "keyboard_switches.h",
     "keyboard_util.cc",
     "keyboard_util.h",
+    "webui/vk_mojo_handler.cc",
+    "webui/vk_mojo_handler.h",
+    "webui/vk_webui_controller.cc",
+    "webui/vk_webui_controller.h",
   ]
 
   defines = [ "KEYBOARD_IMPLEMENTATION" ]
 
   deps = [
+    ":keyboard_mojom_bindings",
     ":resources",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
+    "//content/public/common",
+    "//mojo/public/cpp/bindings",
+    "//mojo/environment:chromium",
+    "//mojo/bindings/js",
+    "//mojo/system",
     "//url",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/keyboard/webui",
     "//ui/wm",
   ]
+}
 
-  # http://crbug.com/408651 Include cycle between this target and the "webui"
-  # sub-target.
-  allow_circular_includes_from = [ "//ui/keyboard/webui" ]
+# GYP version: ui/keyboard/keyboard.gyp:keyboard_mojom_bindings
+mojom("keyboard_mojom_bindings") {
+  sources = [
+    "webui/keyboard.mojom",
+  ]
 }
 
 grit("resources_grit") {
   source = "keyboard_resources.grd"
   outputs = [
     "grit/keyboard_resources.h",
     "grit/keyboard_resources_map.h",
     "keyboard_resources.pak",
     "keyboard_resources.rc",
   ]
 
   keyboard_mojom_gen_js = "$root_gen_dir/ui/keyboard/webui/keyboard.mojom.js"
   grit_flags = [
     "-E", "keyboard_mojom_gen_js=" +
           rebase_path(keyboard_mojom_gen_js, root_build_dir),
   ]
 
   deps = [
-    "webui:mojo_bindings"
+    ":keyboard_mojom_bindings",
   ]
 }
 
 copy("resources") {
   sources = [ "$target_gen_dir/keyboard_resources.pak" ]
   outputs = [ "$root_out_dir/keyboard_resources.pak" ]
   deps = [ ":resources_grit" ]
   forward_dependent_configs_from = deps
 }
 
@@ skipping 17 matching lines @@
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/resources:ui_test_pak",
     "//ui/wm",
     "//url",
   ]
 }