Extract content dependency from keyboard code

ui/keyboard/BUILD.gn

Index: ui/keyboard/BUILD.gn
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index a62fc8b7fb8852bd41c39f99f78ef507157e589c..0b0a212d9f5362096223de8091b97ea9fbb963ca 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -7,22 +7,18 @@ import("//third_party/google_input_tools/closure.gni")
 import("//third_party/google_input_tools/inputview.gni")
 import("//tools/grit/grit_rule.gni")
 
-component("keyboard") {
+source_set("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_export.h",
     "keyboard_layout_manager.cc",
     "keyboard_layout_manager.h",
     "keyboard_switches.cc",
     "keyboard_switches.h",
+    "keyboard_ui.cc",
+    "keyboard_ui.h",
     "keyboard_util.cc",
     "keyboard_util.h",
   ]
@@ -30,13 +26,48 @@ component("keyboard") {
   defines = [ "KEYBOARD_IMPLEMENTATION" ]

[sky, 2015/10/09 18:23:29]

Similar comment about this define as in gyp file.

 
   deps = [
+    "//base",
+    "//base/third_party/dynamic_annotations",
+    "//media",
+    "//skia",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/base/ime",
+    "//ui/compositor",
+    "//ui/events",
+    "//ui/events:dom_keycode_converter",
+    "//ui/events:events_base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
+  if (use_ozone) {
+    deps += [ "//ui/ozone" ]
+  }
+}
+
+component("keyboard_with_content") {
+  sources = [
+    "content/keyboard.cc",
+    "content/keyboard.h",
+    "content/keyboard_constants.cc",
+    "content/keyboard_constants.h",
+    "content/keyboard_content_util.cc",
+    "content/keyboard_content_util.h",
+    "content/keyboard_ui_content.cc",
+    "content/keyboard_ui_content.h",
+  ]
+
+  defines = [ "KEYBOARD_IMPLEMENTATION" ]
+
+  deps = [
+    ":keyboard",
     ":resources",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
     "//content/public/common",
     "//ipc",
-    "//media",
     "//skia",
     "//ui/aura",
     "//ui/base",
@@ -50,10 +81,6 @@ component("keyboard") {
     "//ui/wm",
     "//url",
   ]
-
-  if (use_ozone) {
-    deps += [ "//ui/ozone" ]
-  }
 }
 
 grit("resources_grit") {
@@ -107,7 +134,7 @@ test("keyboard_unittests") {
   ]
 
   deps = [
-    ":keyboard",
+    ":keyboard_with_content",
     "//base",
     "//base/allocator",
     "//base/test:test_support",