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 183 matching lines @@
         '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',

[Yuki, 2014/11/20 09:23:03]

Could you sort the files?

[Shu Chen, 2014/11/20 14:32:26]

Done.

+        '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',
         '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 420 matching lines @@
         ['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/chromeos/character_composer.cc',

[Yuki, 2014/11/20 09:23:03]

filename_rules.gypi automatically excludes chromeos/ directory, so you don't
need to list these files.

[Shu Chen, 2014/11/20 14:32:26]

Done.

+            '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',

[Yuki, 2014/11/20 09:23:03]

Actually the files with the suffix "_chromeos.{h,cc}" are also automatically
excluded by filename_rules.gypi.

We don't need this whole section.

[Shu Chen, 2014/11/20 14:32:26]

Done.

             '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',
           ],
         }],
         ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
           'sources!': [
             'ime/input_method_auralinux.cc',
             'ime/input_method_auralinux.h',
@@ skipping 52 matching lines @@
           # to have sources that are built on iOS, the target should be changed
           # to be of type static_library on all platforms.
           'type': 'none',
         }],
         ['use_aura==1', {
           'sources!': [
             'test/ui_controls_mac.mm',
             'test/ui_controls_win.cc',
           ],
         }],
+        ['chromeos == 1', {
+          'sources': [
+            'ime/chromeos/fake_input_method_delegate.cc',

[Yuki, 2014/11/20 09:23:03]

Since chromeos/* are automatically excluded, you can list these files directly
in 'sources' section.

[Shu Chen, 2014/11/20 14:32:27]

Done.

+            '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',
+          ],
+        }],
       ],
     },
   ],
   'conditions': [
     ['OS=="android"' , {
        'targets': [
          {
            # GN version: //ui/base:ui_base_jni_headers
            'target_name': 'ui_base_jni_headers',
            'type': 'none',
@@ skipping 10 matching lines @@
            ],
            'variables': {
              'jni_gen_package': 'ui',
            },
            'includes': [ '../../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }