Revert of Split ui/base/ime into a new component

ui/base/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("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 298 matching lines @@
     "//cc",
     "//net",
     "//third_party/icu",
     "//ui/events",
     "//ui/events/devices",
     "//ui/resources",
     "//ui/strings",
     "//url",
   ]
 
+  if (build_ime) {
+    sources += [
+      "ime/candidate_window.cc",
+      "ime/candidate_window.h",
+      "ime/chromeos/character_composer.cc",
+      "ime/chromeos/character_composer.h",
+      "ime/chromeos/component_extension_ime_manager.cc",
+      "ime/chromeos/component_extension_ime_manager.h",
+      "ime/chromeos/composition_text.cc",
+      "ime/chromeos/composition_text.h",
+      "ime/chromeos/extension_ime_util.cc",
+      "ime/chromeos/extension_ime_util.h",
+      "ime/chromeos/fake_ime_keyboard.cc",
+      "ime/chromeos/fake_ime_keyboard.h",
+      "ime/chromeos/fake_input_method_delegate.cc",
+      "ime/chromeos/fake_input_method_delegate.h",
+      "ime/chromeos/ime_bridge.cc",
+      "ime/chromeos/ime_bridge.h",
+      "ime/chromeos/ime_keyboard.cc",
+      "ime/chromeos/ime_keyboard.h",
+      "ime/chromeos/ime_keyboard_ozone.cc",
+      "ime/chromeos/ime_keyboard_ozone.h",
+      "ime/chromeos/ime_keyboard_x11.cc",
+      "ime/chromeos/ime_keyboard_x11.h",
+      "ime/chromeos/ime_keymap.cc",
+      "ime/chromeos/ime_keymap.h",
+      "ime/chromeos/input_method_delegate.h",
+      "ime/chromeos/input_method_descriptor.cc",
+      "ime/chromeos/input_method_descriptor.h",
+      "ime/chromeos/input_method_manager.cc",
+      "ime/chromeos/input_method_manager.h",
+      "ime/chromeos/input_method_whitelist.cc",
+      "ime/chromeos/input_method_whitelist.h",
+      "ime/chromeos/mock_component_extension_ime_manager_delegate.cc",
+      "ime/chromeos/mock_component_extension_ime_manager_delegate.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",
+        "//chromeos/ime:gencode",
+      ]
+      if (!use_ozone) {
+        sources -= [
+          "ime/chromeos/ime_keyboard_ozone.cc",
+          "ime/chromeos/ime_keyboard_ozone.h",
+        ]
+      }
+      if (!use_x11) {
+        sources -= [
+          "ime/chromeos/ime_keyboard_x11.cc",
+          "ime/chromeos/ime_keyboard_x11.h",
+        ]
+      }
+    }
+
+    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",
     ]
   }
 
   if (toolkit_views) {
     deps += [ "//ui/events" ]
   }
@@ skipping 90 matching lines @@
     ]
     ldflags = [
       "/DELAYLOAD:d2d1.dll",
       "/DELAYLOAD:d3d10_1.dll",
       "/DELAYLOAD:dwmapi.dll",
     ]
     libs += [
       "d2d1.lib",
       "d3d10_1.lib",
       "dwmapi.lib",
+      "imm32.lib",
       "d2d1.lib",
       "dwmapi.lib",
       "oleacc.lib",
     ]
   } else {
     if (!use_aura) {
       sources -= [
         "view_prop.cc",
         "view_prop.h",
       ]
@@ skipping 146 matching lines @@
     "//ui/gfx/geometry",
   ]
 
   if (build_ime) {
     sources += [
       "ime/dummy_input_method.cc",
       "ime/dummy_input_method.h",
       "ime/dummy_text_input_client.cc",
       "ime/dummy_text_input_client.h",
     ]
-
-    deps += [ "//ui/base/ime" ]
   }
 
   if (!use_aura) {
     sources -= [ "test/ui_controls_aura.cc" ]
   } else if (is_win) {
     sources -= [ "test/ui_controls_win.cc" ]
   }
 }
 
 if (is_android) {
@@ skipping 106 matching lines @@
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//ui/strings",
     "//url",
   ]
 
   if (is_ios) {
     # TODO(GYP) lots of iOS-only steps for ui_base_unittests
   }
 
-  if (build_ime) {
-    deps += [ "//ui/base/ime" ]
-  }
-
   if (is_win) {
     sources += [
       "dragdrop/os_exchange_data_win_unittest.cc",
       "win/hwnd_subclass_unittest.cc",
       "win/open_file_name_win_unittest.cc",
     ]
 
     ldflags = [
       "/DELAYLOAD:d2d1.dll",
       "/DELAYLOAD:d3d10_1.dll",
@@ skipping 60 matching lines @@
   }
 
   if (is_chromeos) {
     deps += [
       "//chromeos",
       "//ui/events:dom4_keycode_converter",
     ]
   }
 }
 # TODO(GYP) Mac (ui_base_tests_bundle)