IME: Split //ui/base/ime into separate factory and implementation tar…

…gets

Break up //ui/base/ime into several components, one for each
implementation, plus a factory component.

The reason this is useful is that it provides a cycle-free way for ozone
to choose which ui::InputMethod implementation to use. Each InputMethod
implementation creates a natural component that platforms can depend on
if they use that InputMethod. The factory component is layered above
these to provide a single entry point for creating the implementation.

This introduces some more fine grained dependencies:

- Targets that directly use a particular ui::InputMethod implementation
  now have to declare an explicit dependency on its component

- Targets that need to create an appropriate ui::InputMethod without
  knowing which one they want need to declare a dependency on the factory
  component.

Targets that just use the ui::InputMethod base class and related
interfaces can continue to depend on //ui/base/ime.

Bug: 943789
Test: various builds, ui_unittests
TBR=sky@chromium.org
  (mechanical BUILD & include changes)

Change-Id: I83ef7b3112e2e68cada86b7ce1aa598a20f3c7cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1531479
Reviewed-by: Shu Chen <shuchen@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#647403}

ash/BUILD.gn

@@ -1386,7 +1386,8 @@ component("ash") {
     "//ui/accessibility",
     "//ui/base",
     "//ui/base:ui_data_pack",
-    "//ui/base/ime",
+    "//ui/base/ime/chromeos",
+    "//ui/base/ime/init",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/chromeos/resources",
@@ -1546,7 +1547,8 @@ static_library("ash_shell_lib_with_content") {
     "//skia",
     "//ui/aura",
     "//ui/base",
-    "//ui/base/ime",
+    "//ui/base/ime/chromeos",
+    "//ui/base/ime/init",
     "//ui/compositor",
     "//ui/display",
     "//ui/events/devices",
@@ -1967,6 +1969,7 @@ test("ash_unittests") {
     "//ui/base",
     "//ui/base:test_support",
     "//ui/base/ime",
+    "//ui/base/ime/chromeos",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/compositor",

ash/app_list/BUILD.gn

@@ -131,6 +131,7 @@ component("app_list") {
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
+    "//ui/base/ime/chromeos",
     "//ui/chromeos/search_box",
     "//ui/compositor",
     "//ui/display",

ash/display/window_tree_host_manager.cc

@@ -39,7 +39,7 @@
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/class_property.h"
-#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_switches_util.h"

ash/shell/content/client/shell_main_delegate.cc

@@ -19,7 +19,7 @@
 #include "services/service_manager/public/cpp/service.h"
 #include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
 #include "services/ws/ime/test_ime_driver/test_ime_application.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {

ash/test/ash_test_base.cc

@@ -61,7 +61,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

ash/test/ash_test_helper.cc

@@ -55,7 +55,7 @@
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/platform_window_defaults.h"
 #include "ui/base/ui_base_features.h"

chrome/browser/chromeos/BUILD.gn

@@ -240,6 +240,7 @@ source_set("chromeos") {
     "//ui/aura",
     "//ui/base",
     "//ui/base/idle",
+    "//ui/base/ime/chromeos",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/compositor",
@@ -2650,7 +2651,8 @@ source_set("unit_tests") {
     "//third_party/blink/public:blink_headers",
     "//third_party/icu",
     "//third_party/leveldatabase",
-    "//ui/base/ime",
+    "//ui/base/ime/chromeos",
+    "//ui/base/ime/init",
     "//ui/chromeos/resources",
   ]
   data = [

chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
-#include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h"
+#include "ui/base/ime/ime_candidate_window_handler_interface.h"
 #include "ui/base/ime/infolist_entry.h"
 #include "ui/chromeos/ime/candidate_window_view.h"
 #include "ui/views/widget/widget_observer.h"

chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

@@ -35,7 +35,7 @@
 #include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h"
 #include "ui/base/ime/chromeos/mock_ime_engine_handler.h"
 #include "ui/base/ime/ime_bridge.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 
 namespace chromeos {
 

chrome/browser/chromeos/input_method/textinput_test_helper.cc

@@ -19,7 +19,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/ime/init/input_method_factory.h"
 
 namespace chromeos {
 

chrome/browser/extensions/BUILD.gn

@@ -1000,6 +1000,7 @@ jumbo_static_library("extensions") {
       "//remoting/host",
       "//remoting/host/it2me:chrome_os_host",
       "//third_party/protobuf:protobuf_lite",
+      "//ui/base/ime/chromeos",
       "//ui/chromeos",
       "//ui/chromeos/events",
       "//ui/file_manager",

chrome/browser/ui/BUILD.gn

@@ -1315,6 +1315,10 @@ jumbo_split_static_library("ui") {
       deps += [ "//ui/ozone" ]
     }
 
+    if (is_linux && !is_chromeos) {
+      deps += [ "//ui/base/ime/linux" ]
+    }
+
     if (!toolkit_views) {
       sources += [ "media_router/cloud_services_dialog.cc" ]
     }
@@ -1816,7 +1820,7 @@ jumbo_split_static_library("ui") {
       "//services/device/public/mojom",
       "//services/ws/public/cpp",
       "//services/ws/public/mojom",
-      "//ui/base/ime",
+      "//ui/base/ime/chromeos",
       "//ui/chromeos",
       "//ui/chromeos/events",
       "//ui/compositor_extra",

chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc

@@ -21,8 +21,8 @@
 #include "ui/aura/test/mus/change_completion_waiter.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/dummy_text_input_client.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

chrome/browser/ui/libgtkui/BUILD.gn

@@ -106,6 +106,7 @@ jumbo_component("libgtkui") {
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
+    "//ui/base/ime/linux",
     "//ui/display",
     "//ui/events",
     "//ui/events:dom_keyboard_layout",

chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc

@@ -13,7 +13,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/composition_text.h"
-#include "ui/base/ime/composition_text_util_pango.h"
+#include "ui/base/ime/linux/composition_text_util_pango.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"

chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc

@@ -18,7 +18,7 @@
 #include "components/prefs/pref_service.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

chrome/browser/ui/views/ime_driver/input_method_bridge_chromeos.cc

@@ -9,8 +9,8 @@
 
 #include "chrome/browser/chromeos/accessibility/accessibility_input_method_observer.h"
 #include "chrome/browser/ui/views/ime_driver/remote_text_input_client.h"
+#include "ui/base/ime/chromeos/input_method_chromeos.h"
 #include "ui/base/ime/ime_bridge.h"
-#include "ui/base/ime/input_method_chromeos.h"
 
 namespace {
 

chrome/browser/ui/views/test/view_event_test_base.cc

@@ -14,7 +14,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "mojo/core/embedder/embedder.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"

chrome/test/BUILD.gn

@@ -281,7 +281,7 @@ static_library("test_support") {
       "//components/user_manager:test_support",
       "//ui/aura",
       "//ui/aura:test_support",
-      "//ui/base/ime",
+      "//ui/base/ime/init",
     ]
   }
 
@@ -5329,6 +5329,10 @@ if (!is_android) {
       sources += [ "../browser/ui/views/accessibility/browser_accessibility_uitest_auralinux.cc" ]
       configs += [ "//build/config/linux/atk" ]
     }
+
+    if (is_linux && !is_chromeos) {
+      deps += [ "//ui/base/ime/linux" ]
+    }
   }
 }
 

chromecast/graphics/BUILD.gn

@@ -62,7 +62,7 @@ cast_source_set("graphics") {
     ]
 
     deps += [
-      "//ui/base/ime",
+      "//ui/base/ime/init",
       "//ui/events:gesture_detection",
       "//ui/views",
       "//ui/wm",

chromecast/graphics/cast_window_manager_aura.cc

@@ -19,8 +19,8 @@
 #include "ui/aura/null_window_targeter.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_platform.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/base/ime/input_method_factory.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/ozone/public/ozone_platform.h"

components/exo/BUILD.gn

@@ -145,6 +145,7 @@ source_set("test_support") {
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",
+    "//ui/base/ime/init",
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/display/manager",

components/exo/test/exo_test_base.cc

@@ -10,7 +10,7 @@
 #include "components/exo/wm_helper.h"
 #include "components/exo/wm_helper_chromeos.h"
 #include "ui/aura/env.h"
-#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/wm/core/wm_core_switches.h"
 
 namespace exo {

components/exo/test/exo_test_base_aura.cc

@@ -5,7 +5,7 @@
 #include "components/exo/test/exo_test_base_aura.h"
 
 #include "components/exo/wm_helper.h"
-#include "ui/base/ime/input_method_factory.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/wm/core/default_activation_client.h"

content/browser/BUILD.gn

@@ -202,7 +202,7 @@ jumbo_source_set("browser") {
     "//ui/base:buildflags",
     "//ui/base/clipboard",
     "//ui/base/idle",
-    "//ui/base/ime",
+    "//ui/base/ime/init",
     "//ui/base/mpris/buildflags",
     "//ui/display",
     "//ui/display/types",
@@ -2523,6 +2523,10 @@ jumbo_source_set("browser") {
       "renderer_host/render_widget_host_view_event_handler.cc",
       "renderer_host/render_widget_host_view_event_handler.h",
     ]
+
+    if (is_linux && !is_chromeos) {
+      deps += [ "//ui/base/ime/linux" ]
+    }
   } else {  # Not aura.
     sources -= [
       "media/desktop_media_window_registry_aura.cc",

content/browser/browser_main_runner_impl.cc

@@ -29,7 +29,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "third_party/skia/include/core/SkGraphics.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/tracing_controller_android.h"

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -97,8 +97,8 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/input_method_keyboard_controller.h"
 #include "ui/base/ime/mock_input_method.h"
 #include "ui/base/ui_base_features.h"

content/public/test/content_browser_test.cc

@@ -31,7 +31,7 @@
 #endif
 
 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #endif
 
 #if defined(OS_CHROMEOS)

content/shell/BUILD.gn

@@ -339,7 +339,7 @@ jumbo_static_library("content_shell_lib") {
     "//third_party/icu",
     "//ui/base",
     "//ui/base/clipboard",
-    "//ui/base/ime",
+    "//ui/base/ime/init",
     "//ui/display",
     "//ui/events:events_base",
     "//ui/gfx",

content/shell/browser/shell_browser_main_parts.cc

@@ -49,7 +49,7 @@
 #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
 #endif
 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #endif
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"

content/shell/browser/shell_platform_data_aura.cc

@@ -15,9 +15,9 @@
 #include "ui/aura/test/test_window_parenting_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/ime/init/input_method_factory.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_delegate.h"
-#include "ui/base/ime/input_method_factory.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/platform_window/platform_window_init_properties.h"
 #include "ui/wm/core/default_activation_client.h"

content/shell/browser/web_test/web_test_browser_main_parts.cc

@@ -43,7 +43,7 @@
 #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
 #endif
 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #endif
 
 namespace content {

content/test/BUILD.gn

@@ -579,7 +579,7 @@ jumbo_static_library("browsertest_support") {
     "//testing/gtest",
     "//ui/accessibility:ax_enums_mojo",
     "//ui/base",
-    "//ui/base/ime",
+    "//ui/base/ime/init",
   ]
 
   if (is_android) {
@@ -2036,7 +2036,7 @@ test("content_unittests") {
     "//ui/accessibility:test_support",
     "//ui/base:test_support",
     "//ui/base/clipboard:clipboard_test_support",
-    "//ui/base/ime",
+    "//ui/base/ime/init",
     "//ui/compositor:test_support",
     "//ui/display",
     "//ui/display:test_support",

extensions/shell/BUILD.gn

@@ -70,7 +70,7 @@ source_set("app_shell_lib") {
     "//google_apis",
     "//third_party/blink/public:blink",
     "//ui/base",
-    "//ui/base/ime",
+    "//ui/base/ime/init",
   ]
 
   # TODO(michaelpg): remove Mac support and always use aura.
@@ -346,6 +346,7 @@ test("app_shell_unittests") {
     deps += [
       "//ui/aura:test_support",
       "//ui/base:test_support",
+      "//ui/base/ime/init",
       "//ui/compositor:test_support",
     ]
   }

extensions/shell/browser/shell_browser_main_parts.cc

@@ -42,7 +42,7 @@
 #include "extensions/shell/browser/shell_update_query_params_delegate.h"
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/common/switches.h"
-#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_AURA)