Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

trunk/src/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_memory.gypi',
@@ skipping 210 matching lines @@
         'ime/fake_xkeyboard.h',
         'ime/ibus_keymap.cc',
         'ime/ibus_keymap.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_property.cc',
+        'ime/input_method_property.h',
         'ime/input_method_whitelist.cc',
         'ime/input_method_whitelist.h',
         'ime/xkeyboard.cc',
         'ime/xkeyboard.h',
         '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',
@@ skipping 241 matching lines @@
         'dbus/shill_manager_client_unittest.cc',
         'dbus/shill_profile_client_unittest.cc',
         'dbus/shill_service_client_unittest.cc',
         'disks/disk_mount_manager_unittest.cc',
         'display/output_configurator_unittest.cc',
         'display/output_util_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_property_unittest.cc',
         'ime/input_method_whitelist_unittest.cc',
         'ime/xkeyboard_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',
@@ skipping 41 matching lines @@
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }