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

ui/base/ui_base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 182 matching lines @@
         'idle/idle.cc',
         'idle/idle_chromeos.cc',
         'idle/idle.h',
         'idle/idle_linux.cc',
         'idle/idle_mac.mm',
         'idle/idle_query_x11.cc',
         'idle/idle_query_x11.h',
         'idle/idle_win.cc',
         'idle/screensaver_window_finder_x11.cc',
         'idle/screensaver_window_finder_x11.h',
+        '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',
         'l10n/formatter.cc',
         'l10n/formatter.h',
         'l10n/l10n_font_util.cc',
         'l10n/l10n_font_util.h',
         'l10n/l10n_util.cc',
         'l10n/l10n_util.h',
         'l10n/l10n_util_android.cc',
         'l10n/l10n_util_android.h',
         'l10n/l10n_util_collator.h',
         'l10n/l10n_util_mac.h',
@@ skipping 274 matching lines @@
               ],
               'AdditionalDependencies': [
                 'd2d1.lib',
                 'd3d10_1.lib',
                 'dwmapi.lib',
               ],
             },
           },
           'link_settings': {
             'libraries': [
+              '-limm32.lib',
               '-ld2d1.lib',
               '-ldwmapi.lib',
               '-loleacc.lib',
             ],
           },
         }, {  # OS!="win"
           'conditions': [
             ['use_aura==0', {
               'sources!': [
                 'view_prop.cc',
@@ skipping 103 matching lines @@
           'libraries': [
             '-ldl',
           ],
         }],
         ['use_system_icu==1', {
           # When using the system icu, the icu targets generate shim headers
           # which are included by public headers in the ui target, so we need
           # ui to be a hard dependency for all its users.
           'hard_dependency': 1,
         }],
+        ['toolkit_views==0 and use_aura==0', {
+          'sources!': [
+            'ime/input_method_factory.cc',
+            'ime/input_method_factory.h',
+            'ime/input_method_minimal.cc',
+            'ime/input_method_minimal.h',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '../../chromeos/chromeos.gyp:chromeos',
           ],
           'sources!': [
             'idle/idle_linux.cc',
             'idle/idle_query_x11.cc',
             'idle/idle_query_x11.h',
             'idle/screensaver_window_finder_x11.cc',
             'idle/screensaver_window_finder_x11.h',
           ],
         }],
+        ['OS!="win"', {
+          'sources!': [
+            'ime/input_method_imm32.cc',
+            'ime/input_method_imm32.h',
+          ],
+        }],
+        ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
+          'sources!': [
+            'ime/input_method_auralinux.cc',
+            'ime/input_method_auralinux.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',
+          ],
+        }],
+        ['use_x11==0', {
+          'sources!': [
+            'ime/composition_text_util_pango.cc',
+            'ime/composition_text_util_pango.h',
+          ],
+        }],
       ],
     },
     {
       # GN version: //ui/base:test_support
       'target_name': 'ui_base_test_support',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         # Note: file list duplicated in GN build.
         'test/test_clipboard.cc',
         'test/test_clipboard.h',
         'test/ui_controls.h',
         'test/ui_controls_aura.cc',
         'test/ui_controls_internal_win.cc',
         'test/ui_controls_internal_win.h',
         'test/ui_controls_mac.mm',
         'test/ui_controls_win.cc',
       ],
       'include_dirs': [
         '../..',
       ],
       'conditions': [
         ['OS!="ios"', {
           'type': 'static_library',
-            'dependecies': [
-              'ime/ui_base_ime.gyp:ui_base_ime',
-            ],
             'sources': [
               'ime/dummy_input_method.cc',
               'ime/dummy_input_method.h',
               'ime/dummy_text_input_client.cc',
               'ime/dummy_text_input_client.h',
             ],
         }, {  # OS=="ios"
           # None of the sources in this target are built on iOS, resulting in
           # link errors when building targets that depend on this target
           # because the static library isn't found. If this target is changed
@@ skipping 30 matching lines @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }