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

ui/chromeos/ui_chromeos.gyp

Index: ui/chromeos/ui_chromeos.gyp
diff --git a/ui/chromeos/ui_chromeos.gyp b/ui/chromeos/ui_chromeos.gyp
index dd3ae803e5cfbb3cd1908c3c7b62a62f32020ca6..faed249e415c30ae54a06d07a17efca211f465d7 100644
--- a/ui/chromeos/ui_chromeos.gyp
+++ b/ui/chromeos/ui_chromeos.gyp
@@ -5,6 +5,62 @@
 {
   'variables': {
     'chromium_code': 1,
+    'ui_chromeos_sources': [
+      'accessibility_types.h',
+      'ime/component_extension_ime_manager.cc',
+      'ime/component_extension_ime_manager.h',
+      'ime/composition_text.cc',
+      'ime/composition_text.h',
+      'ime/extension_ime_util.cc',
+      'ime/extension_ime_util.h',
+      'ime/fake_ime_keyboard.cc',
+      'ime/fake_ime_keyboard.h',
+      'ime/ime_keyboard.cc',
+      'ime/ime_keyboard.h',
+      'ime/ime_keyboard_ozone.cc',
+      'ime/ime_keyboard_ozone.h',
+      'ime/ime_keyboard_x11.cc',
+      'ime/ime_keyboard_x11.h',
+      'ime/input_method_delegate.h',
+      'ime/input_method_descriptor.cc',
+      'ime/input_method_descriptor.h',
+      'ime/input_method_manager.cc',
+      'ime/input_method_manager.h',
+      'ime/input_method_whitelist.cc',
+      'ime/input_method_whitelist.h',
+

[Yuki, 2014/11/19 14:16:43]

No need to separate by an empty line.

[Shu Chen, 2014/11/19 16:40:53]

Done.

+      'ime/view/candidate_view.cc',
+      'ime/view/candidate_view.h',
+      'ime/view/candidate_window_view.cc',
+      'ime/view/candidate_window_view.h',
+      'ime/view/infolist_window.cc',
+      'ime/view/infolist_window.h',
+      'ime/view/input_method_menu_item.cc',
+      'ime/view/input_method_menu_item.h',
+      'ime/view/input_method_menu_manager.cc',
+      'ime/view/input_method_menu_manager.h',
+      'ime/view/mode_indicator_view.cc',
+      'ime/view/mode_indicator_view.h',
+

[Yuki, 2014/11/19 14:16:43]

No need to separate by an empty line.

[Shu Chen, 2014/11/19 16:40:53]

Done.

+      'network/network_connect.cc',
+      'network/network_connect.h',
+      'network/network_icon.cc',
+      'network/network_icon.h',
+      'network/network_icon_animation.cc',
+      'network/network_icon_animation.h',
+      'network/network_icon_animation_observer.h',
+      'network/network_info.cc',
+      'network/network_info.h',
+      'network/network_list.cc',
+      'network/network_list.h',
+      'network/network_list_delegate.h',
+      'network/network_state_notifier.cc',
+      'network/network_state_notifier.h',
+      'touch_exploration_controller.cc',
+      'touch_exploration_controller.h',
+      'user_activity_power_manager_notifier.cc',
+      'user_activity_power_manager_notifier.h',
+    ],
   },
   'targets': [
     {
@@ -47,6 +103,7 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../chromeos/chromeos.gyp:chromeos',
         '../../chromeos/chromeos.gyp:power_manager_proto',
         '../../skia/skia.gyp:skia',
         '../aura/aura.gyp:aura',
@@ -61,38 +118,14 @@
       'defines': [
         'UI_CHROMEOS_IMPLEMENTATION',
       ],
-      'sources': [
-        'accessibility_types.h',
-        'ime/candidate_view.cc',
-        'ime/candidate_view.h',
-        'ime/candidate_window_view.cc',
-        'ime/candidate_window_view.h',
-        'ime/infolist_window.cc',
-        'ime/infolist_window.h',
-        'ime/input_method_menu_item.cc',
-        'ime/input_method_menu_item.h',
-        'ime/input_method_menu_manager.cc',
-        'ime/input_method_menu_manager.h',
-        'ime/mode_indicator_view.cc',
-        'ime/mode_indicator_view.h',
-        'network/network_connect.cc',
-        'network/network_connect.h',
-        'network/network_icon.cc',
-        'network/network_icon.h',
-        'network/network_icon_animation.cc',
-        'network/network_icon_animation.h',
-        'network/network_icon_animation_observer.h',
-        'network/network_info.cc',
-        'network/network_info.h',
-        'network/network_list.cc',
-        'network/network_list.h',
-        'network/network_list_delegate.h',
-        'network/network_state_notifier.cc',
-        'network/network_state_notifier.h',
-        'touch_exploration_controller.cc',
-        'touch_exploration_controller.h',
-        'user_activity_power_manager_notifier.cc',
-        'user_activity_power_manager_notifier.h',
+      'sources': [ '<@(ui_chromeos_sources)' ],
+      'conditions': [
+        ['use_x11 == 1', {
+          'dependencies': [
+            '../../build/linux/system.gyp:x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
+          ],
+        }],
       ],
     },  # target_name: ui_chromeos
   ],