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 9f187df8d8a9ca6d89586c2ac3862a06f0afd81c..dca50afd1aea254163d1fe9674051d15e777a2c0 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -201,6 +201,29 @@
         'ime/chromeos/mock_ime_engine_handler.h',
         'ime/chromeos/mock_ime_input_context_handler.cc',
         'ime/chromeos/mock_ime_input_context_handler.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/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/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/input_method_chromeos.cc',
+        'ime/input_method_chromeos.h',
         'ime/composition_text.cc',
         'ime/composition_text.h',
         'ime/composition_text_util_pango.cc',
@@ -215,8 +238,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',
@@ -657,15 +678,43 @@
         }],
         ['chromeos==0', {
           'sources!': [
+            'ime/chromeos/character_composer.cc',
+            'ime/chromeos/character_composer.h',
+            'ime/chromeos/ime_bridge.cc',
+            'ime/chromeos/ime_bridge.h',
+            'ime/chromeos/ime_keymap.cc',
+            'ime/chromeos/ime_keymap.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/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/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/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/input_method_chromeos.cc',
             'ime/input_method_chromeos.h',
           ],
         }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../../chromeos/chromeos.gyp:chromeos',
-          ],
-        }],
         ['OS!="win"', {
           'sources!': [
             'ime/input_method_imm32.cc',
@@ -738,6 +787,14 @@
             'test/ui_controls_win.cc',
           ],
         }],
+        ['chromeos == 1', {
+          'sources': [
+            'ime/chromeos/fake_input_method_delegate.cc',
+            'ime/chromeos/fake_input_method_delegate.h',
+            'ime/chromeos/mock_component_extension_ime_manager_delegate.cc',
+            'ime/chromeos/mock_component_extension_ime_manager_delegate.h',
+          ],
+        }],
       ],
     },
   ],