Folds ui/base/ime/BUILD.gn into ui/base (to fix circular dependencies)

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 047c0b853a9883efbc0f6e8eb188931f32a40f6b..80db6988394e85ef2bc8b6f8dfbf16933f84dd9b 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -9,6 +9,8 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
+build_ime = !is_ios
+
 component("base") {
   output_name = "ui_base"
   sources = [
@@ -301,17 +303,116 @@ component("base") {
     "//ui/gfx",
   ]
 
+  if (build_ime) {
+    if (!is_android) {
+      deps += [
+        "//ui/events",
+      ]
+    }
+
+    sources += [
+      "ime/candidate_window.cc",
+      "ime/candidate_window.h",
+      "ime/chromeos/character_composer.cc",
+      "ime/chromeos/character_composer.h",
+      "ime/chromeos/ime_bridge.cc",
+      "ime/chromeos/ime_bridge.h",
+      "ime/chromeos/ime_keymap.cc",
+      "ime/chromeos/ime_keymap.h",
+      "ime/chromeos/mock_ime_candidate_window_handler.cc",
+      "ime/chromeos/mock_ime_candidate_window_handler.h",
+      "ime/chromeos/mock_ime_engine_handler.cc",
+      "ime/chromeos/mock_ime_engine_handler.h",
+      "ime/chromeos/mock_ime_input_context_handler.cc",
+      "ime/chromeos/mock_ime_input_context_handler.h",
+      "ime/composition_text.cc",
+      "ime/composition_text.h",
+      "ime/composition_text_util_pango.cc",
+      "ime/composition_text_util_pango.h",
+      "ime/composition_underline.h",
+      "ime/dummy_input_method_delegate.cc",
+      "ime/dummy_input_method_delegate.h",
+      "ime/infolist_entry.cc",
+      "ime/infolist_entry.h",
+      "ime/input_method.h",
+      "ime/input_method_auralinux.cc",
+      "ime/input_method_auralinux.h",
+      "ime/input_method_base.cc",
+      "ime/input_method_base.h",
+      "ime/input_method_chromeos.cc",
+      "ime/input_method_chromeos.h",
+      "ime/input_method_delegate.h",
+      "ime/input_method_factory.cc",
+      "ime/input_method_factory.h",
+      "ime/input_method_initializer.cc",
+      "ime/input_method_initializer.h",
+      "ime/input_method_mac.h",
+      "ime/input_method_mac.mm",
+      "ime/input_method_minimal.cc",
+      "ime/input_method_minimal.h",
+      "ime/input_method_observer.h",
+      "ime/input_method_win.cc",
+      "ime/input_method_win.h",
+      "ime/linux/fake_input_method_context.cc",
+      "ime/linux/fake_input_method_context.h",
+      "ime/linux/fake_input_method_context_factory.cc",
+      "ime/linux/fake_input_method_context_factory.h",
+      "ime/linux/linux_input_method_context.h",
+      "ime/linux/linux_input_method_context_factory.cc",
+      "ime/linux/linux_input_method_context_factory.h",
+      "ime/mock_input_method.cc",
+      "ime/mock_input_method.h",
+      "ime/remote_input_method_delegate_win.h",
+      "ime/remote_input_method_win.cc",
+      "ime/remote_input_method_win.h",
+      "ime/text_input_client.cc",
+      "ime/text_input_client.h",
+      "ime/text_input_focus_manager.cc",
+      "ime/text_input_focus_manager.h",
+      "ime/text_input_type.h",
+      "ime/win/imm32_manager.cc",
+      "ime/win/imm32_manager.h",
+      "ime/win/tsf_input_scope.cc",
+      "ime/win/tsf_input_scope.h",
+    ]
+
+    if (!use_aura || (!is_linux && !use_ozone)) {
+      sources -= [
+        "ime/input_method_auralinux.cc",
+        "ime/input_method_auralinux.h",
+      ]
+    }
+
+    if (!toolkit_views && !use_aura) {
+      sources -= [
+        "ime/input_method_factory.cc",
+        "ime/input_method_factory.h",
+        "ime/input_method_minimal.cc",
+        "ime/input_method_minimal.h",
+      ]
+    }
+
+    if (is_chromeos) {
+      deps += [
+        "//chromeos",
+      ]
+    }
+
+    if (use_pango) {
+      configs += [ "//build/config/linux:pangocairo" ]
+    } else {
+      sources -= [
+        "ime/composition_text_util_pango.cc",
+        "ime/composition_text_util_pango.h",
+      ]
+    }
+  }
+
   if (is_ios) {
     sources += [
       "l10n/l10n_util_mac.h",
       "l10n/l10n_util_mac.mm",
     ]
-  } else {
-    deps += [ "//ui/base/ime" ]
-
-    # http://crbug.com/408648 Circular includes from the ime sub-target to this
-    # one.
-    allow_circular_includes_from = [ "//ui/base/ime" ]
   }
 
   if (toolkit_views) {
@@ -572,7 +673,7 @@ source_set("test_support") {
     "//ui/gfx/geometry",
   ]
 
-  if (!is_ios) {
+  if (build_ime) {
     sources += [
       "ime/dummy_input_method.cc",
       "ime/dummy_input_method.h",
@@ -644,14 +745,6 @@ test("unittests") {
       "cocoa/nsgraphics_context_additions_unittest.mm",
       "cocoa/tracking_area_unittest.mm",
       "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
-      "ime/candidate_window_unittest.cc",
-      "ime/chromeos/character_composer_unittest.cc",
-      "ime/composition_text_util_pango_unittest.cc",
-      "ime/input_method_base_unittest.cc",
-      "ime/input_method_chromeos_unittest.cc",
-      "ime/remote_input_method_win_unittest.cc",
-      "ime/win/imm32_manager_unittest.cc",
-      "ime/win/tsf_input_scope_unittest.cc",
       "models/list_model_unittest.cc",
       "models/list_selection_model_unittest.cc",
       "models/tree_node_model_unittest.cc",
@@ -674,6 +767,19 @@ test("unittests") {
     }
   }
 
+  if (build_ime) {
+    sources += [
+      "ime/candidate_window_unittest.cc",
+      "ime/chromeos/character_composer_unittest.cc",
+      "ime/composition_text_util_pango_unittest.cc",
+      "ime/input_method_base_unittest.cc",
+      "ime/input_method_chromeos_unittest.cc",
+      "ime/remote_input_method_win_unittest.cc",
+      "ime/win/imm32_manager_unittest.cc",
+      "ime/win/tsf_input_scope_unittest.cc",
+    ]
+  }
+
   deps = [
     "//base",
     "//base/allocator",