Moves code from chromeos/ime to ui/base/ime/chromeos.

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 174 matching lines @@
         'dragdrop/os_exchange_data_provider_aurax11.h',
         'dragdrop/os_exchange_data_provider_mac.h',
         'dragdrop/os_exchange_data_provider_mac.mm',
         'dragdrop/os_exchange_data_provider_win.cc',
         'dragdrop/os_exchange_data_provider_win.h',
         'hit_test.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/input_method_chromeos.cc',
+        'ime/input_method_chromeos.h',

[stevenjb, 2014/11/20 19:09:52]

This is no longer sorted, and these should maybe be moved to
ui/base/ime/chromeos/?

[Shu Chen, 2014/11/27 06:11:17]

Done for sorting. For renaming, let's do it in a separated cl.

         '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',
@@ skipping 418 matching lines @@
           '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==0', {
-          'sources!': [
-            'ime/input_method_chromeos.cc',
-            'ime/input_method_chromeos.h',
-          ],
-        }],
         ['chromeos==1', {
           'dependencies': [
             '../../chromeos/chromeos.gyp:chromeos',
           ],
         }],
         ['OS!="win"', {
           'sources!': [
             'ime/input_method_imm32.cc',
             'ime/input_method_imm32.h',
           ],
@@ skipping 89 matching lines @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }