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

ui/base/ui_base.gyp

Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 6b64c7a7249dbe27f1e3f2dd388e749aee2c59cd..f9de8cb1f28dae9e8e4941fbaddde44c5af1b30b 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -192,16 +192,43 @@
         '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',
@@ -216,8 +243,6 @@
         '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',
@@ -656,12 +681,6 @@
             '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',