ozone: Rename XKeyboard to KeyboardController & use fake under ozone

chromeos/chromeos.gyp

 # Copyright (c) 2012 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,
   },
   'includes': [
     'chromeos_tools.gypi'
@@ skipping 226 matching lines @@
         'dbus/update_engine_client.cc',
         'dbus/update_engine_client.h',
         'dbus/volume_state.cc',
         'dbus/volume_state.h',
         'disks/disk_mount_manager.cc',
         'disks/disk_mount_manager.h',
         'ime/component_extension_ime_manager.cc',
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
         'ime/extension_ime_util.h',
-        'ime/fake_xkeyboard.cc',
-        'ime/fake_xkeyboard.h',
+        'ime/fake_ime_keyboard.cc',
+        'ime/fake_ime_keyboard.h',
         'ime/composition_text.cc',
         'ime/composition_text.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',
-        'ime/xkeyboard.cc',
-        'ime/xkeyboard.h',
+        'ime/ime_keyboard.h',
+        'ime/ime_keyboard_ozone.cc',
+        'ime/ime_keyboard_x11.cc',
         'login/login_state.cc',
         'login/login_state.h',
         'network/certificate_pattern.cc',
         'network/certificate_pattern.h',
         'network/client_cert_resolver.cc',
         'network/client_cert_resolver.h',
         'network/client_cert_util.cc',
         'network/client_cert_util.h',
         'network/device_state.cc',
         'network/device_state.h',
@@ skipping 98 matching lines @@
         'tpm_token_loader.h'
       ],
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
             '../build/linux/system.gyp:x11',
           ],
         }, {
           # use_x11 == 0
           'sources!': [
-            'ime/xkeyboard.cc',
-            'ime/xkeyboard.h',
+            'ime/keyboard_controller.cc',
+            'ime/ime_keyboard.h',
           ],
         }],
       ],
     },
     {
       # This target contains mocks that can be used to write unit tests.
       'target_name': 'chromeos_test_support',
       'type': 'static_library',
       'dependencies': [
         '../build/linux/system.gyp:dbus',
@@ skipping 109 matching lines @@
         'dbus/shill_ipconfig_client_unittest.cc',
         'dbus/shill_manager_client_unittest.cc',
         'dbus/shill_profile_client_unittest.cc',
         'dbus/shill_service_client_unittest.cc',
         'disks/disk_mount_manager_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
         'ime/composition_text_unittest.cc',
         'ime/input_method_manager.h',
         'ime/input_method_whitelist_unittest.cc',
-        'ime/xkeyboard_unittest.cc',
+        'ime/ime_keyboard_x11_unittest.cc',
         'login/login_state_unittest.cc',
         'network/client_cert_resolver_unittest.cc',
         'network/geolocation_handler_unittest.cc',
         'network/managed_network_configuration_handler_unittest.cc',
         'network/network_cert_migrator_unittest.cc',
         'network/network_change_notifier_chromeos_unittest.cc',
         'network/network_configuration_handler_unittest.cc',
         'network/network_connection_handler_unittest.cc',
         'network/network_device_handler_unittest.cc',
         'network/network_event_log_unittest.cc',
@@ skipping 68 matching lines @@
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
 
   ],
 }