Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: chromeos/chromeos.gyp

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/ime/mock_xkeyboard.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_tools.gypi' 10 'chromeos_tools.gypi'
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'ime/ibus_keymap.h', 167 'ime/ibus_keymap.h',
168 'ime/input_method_config.cc', 168 'ime/input_method_config.cc',
169 'ime/input_method_config.h', 169 'ime/input_method_config.h',
170 'ime/input_method_delegate.h', 170 'ime/input_method_delegate.h',
171 'ime/input_method_descriptor.cc', 171 'ime/input_method_descriptor.cc',
172 'ime/input_method_descriptor.h', 172 'ime/input_method_descriptor.h',
173 'ime/input_method_property.cc', 173 'ime/input_method_property.cc',
174 'ime/input_method_property.h', 174 'ime/input_method_property.h',
175 'ime/input_method_whitelist.cc', 175 'ime/input_method_whitelist.cc',
176 'ime/input_method_whitelist.h', 176 'ime/input_method_whitelist.h',
177 'ime/xkeyboard.cc',
178 'ime/xkeyboard.h',
177 'network/cros_network_functions.cc', 179 'network/cros_network_functions.cc',
178 'network/cros_network_functions.h', 180 'network/cros_network_functions.h',
179 'network/device_state.cc', 181 'network/device_state.cc',
180 'network/device_state.h', 182 'network/device_state.h',
181 'network/geolocation_handler.cc', 183 'network/geolocation_handler.cc',
182 'network/geolocation_handler.h', 184 'network/geolocation_handler.h',
183 'network/managed_state.cc', 185 'network/managed_state.cc',
184 'network/managed_state.h', 186 'network/managed_state.h',
185 'network/network_change_notifier_chromeos.cc', 187 'network/network_change_notifier_chromeos.cc',
186 'network/network_change_notifier_chromeos.h', 188 'network/network_change_notifier_chromeos.h',
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 'dbus/ibus/mock_ibus_engine_factory_service.cc', 362 'dbus/ibus/mock_ibus_engine_factory_service.cc',
361 'dbus/ibus/mock_ibus_engine_factory_service.h', 363 'dbus/ibus/mock_ibus_engine_factory_service.h',
362 'dbus/ibus/mock_ibus_engine_service.cc', 364 'dbus/ibus/mock_ibus_engine_service.cc',
363 'dbus/ibus/mock_ibus_engine_service.h', 365 'dbus/ibus/mock_ibus_engine_service.h',
364 'dbus/ibus/mock_ibus_panel_service.cc', 366 'dbus/ibus/mock_ibus_panel_service.cc',
365 'dbus/ibus/mock_ibus_panel_service.h', 367 'dbus/ibus/mock_ibus_panel_service.h',
366 'ime/mock_ibus_daemon_controller.cc', 368 'ime/mock_ibus_daemon_controller.cc',
367 'ime/mock_ibus_daemon_controller.h', 369 'ime/mock_ibus_daemon_controller.h',
368 'ime/mock_input_method_delegate.cc', 370 'ime/mock_input_method_delegate.cc',
369 'ime/mock_input_method_delegate.h', 371 'ime/mock_input_method_delegate.h',
372 'ime/mock_xkeyboard.cc',
373 'ime/mock_xkeyboard.h',
370 ], 374 ],
371 'include_dirs': [ 375 'include_dirs': [
372 '..', 376 '..',
373 ], 377 ],
374 }, 378 },
375 { 379 {
376 'target_name': 'chromeos_unittests', 380 'target_name': 'chromeos_unittests',
377 'type': 'executable', 381 'type': 'executable',
378 'dependencies': [ 382 'dependencies': [
379 '../base/base.gyp:run_all_unittests', 383 '../base/base.gyp:run_all_unittests',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 'dbus/ibus/ibus_property_unittest.cc', 417 'dbus/ibus/ibus_property_unittest.cc',
414 'dbus/ibus/ibus_text_unittest.cc', 418 'dbus/ibus/ibus_text_unittest.cc',
415 'dbus/introspectable_client_unittest.cc', 419 'dbus/introspectable_client_unittest.cc',
416 'dbus/modem_messaging_client_unittest.cc', 420 'dbus/modem_messaging_client_unittest.cc',
417 'disks/disk_mount_manager_unittest.cc', 421 'disks/disk_mount_manager_unittest.cc',
418 'ime/component_extension_ime_manager_unittest.cc', 422 'ime/component_extension_ime_manager_unittest.cc',
419 'ime/extension_ime_util_unittest.cc', 423 'ime/extension_ime_util_unittest.cc',
420 'ime/input_method_descriptor_unittest.cc', 424 'ime/input_method_descriptor_unittest.cc',
421 'ime/input_method_property_unittest.cc', 425 'ime/input_method_property_unittest.cc',
422 'ime/input_method_whitelist_unittest.cc', 426 'ime/input_method_whitelist_unittest.cc',
427 'ime/xkeyboard_unittest.cc',
423 'network/cros_network_functions_unittest.cc', 428 'network/cros_network_functions_unittest.cc',
424 'network/geolocation_handler_unittest.cc', 429 'network/geolocation_handler_unittest.cc',
425 'network/network_change_notifier_chromeos_unittest.cc', 430 'network/network_change_notifier_chromeos_unittest.cc',
426 'network/network_configuration_handler_unittest.cc', 431 'network/network_configuration_handler_unittest.cc',
427 'network/network_event_log_unittest.cc', 432 'network/network_event_log_unittest.cc',
428 'network/network_sms_handler_unittest.cc', 433 'network/network_sms_handler_unittest.cc',
429 'network/network_state_handler_unittest.cc', 434 'network/network_state_handler_unittest.cc',
430 'network/network_util_unittest.cc', 435 'network/network_util_unittest.cc',
431 'network/onc/onc_certificate_importer_unittest.cc', 436 'network/onc/onc_certificate_importer_unittest.cc',
432 'network/onc/onc_merger_unittest.cc', 437 'network/onc/onc_merger_unittest.cc',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 '../third_party/cros_system_api/dbus/video_activity_update.proto', 495 '../third_party/cros_system_api/dbus/video_activity_update.proto',
491 ], 496 ],
492 'variables': { 497 'variables': {
493 'proto_in_dir': '../third_party/cros_system_api/dbus/', 498 'proto_in_dir': '../third_party/cros_system_api/dbus/',
494 'proto_out_dir': 'chromeos/dbus', 499 'proto_out_dir': 'chromeos/dbus',
495 }, 500 },
496 'includes': ['../build/protoc.gypi'], 501 'includes': ['../build/protoc.gypi'],
497 }, 502 },
498 ], 503 ],
499 } 504 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/ime/mock_xkeyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698