Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 266 "x/x11_util.h", | 266 "x/x11_util.h", |
| 267 "x/x11_util_internal.h", | 267 "x/x11_util_internal.h", |
| 268 ] | 268 ] |
| 269 | 269 |
| 270 if (is_win) { | 270 if (is_win) { |
| 271 sources += [ "touch/touch_device_win.cc" ] | 271 sources += [ "touch/touch_device_win.cc" ] |
| 272 } else if (is_android) { | 272 } else if (is_android) { |
| 273 sources += [ "touch/touch_device_android.cc" ] | 273 sources += [ "touch/touch_device_android.cc" ] |
| 274 } else if (use_ozone) { | 274 } else if (use_ozone) { |
| 275 sources += [ "touch/touch_device_ozone.cc" ] | 275 sources += [ "touch/touch_device_ozone.cc" ] |
| 276 } else if (use_aura && use_x11) { | 276 } else if (use_aura && use_x11) { |
| 277 sources += [ "touch/touch_device_aurax11.cc" ] | 277 sources += [ "touch/touch_device_aurax11.cc" ] |
| 278 } else { | 278 } else { |
| 279 # Empty implementation for all other cases. | 279 # Empty implementation for all other cases. |
| 280 sources += [ "touch/touch_device.cc" ] | 280 sources += [ "touch/touch_device.cc" ] |
| 281 } | 281 } |
| 282 | 282 |
| 283 defines = [ "UI_BASE_IMPLEMENTATION" ] | 283 defines = [ "UI_BASE_IMPLEMENTATION" ] |
| 284 | 284 |
| 285 deps = [ | 285 deps = [ |
| 286 "//base", | 286 "//base", |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 716 "l10n/l10n_util_win_unittest.cc", | 716 "l10n/l10n_util_win_unittest.cc", |
| 717 "l10n/time_format_unittest.cc", | 717 "l10n/time_format_unittest.cc", |
| 718 "layout_unittest.cc", | 718 "layout_unittest.cc", |
| 719 "models/tree_node_iterator_unittest.cc", | 719 "models/tree_node_iterator_unittest.cc", |
| 720 "resource/data_pack_literal.cc", | 720 "resource/data_pack_literal.cc", |
| 721 "resource/data_pack_unittest.cc", | 721 "resource/data_pack_unittest.cc", |
| 722 "resource/resource_bundle_unittest.cc", | 722 "resource/resource_bundle_unittest.cc", |
| 723 "test/run_all_unittests.cc", | 723 "test/run_all_unittests.cc", |
| 724 ] | 724 ] |
| 725 | 725 |
| 726 if (build_ime) { | |
|
sky
2014/09/16 22:04:42
Why move this?
ckocagil
2014/09/17 14:57:05
I had moved this because a -= operation below requ
| |
| 727 sources += [ | |
| 728 "ime/candidate_window_unittest.cc", | |
| 729 "ime/chromeos/character_composer_unittest.cc", | |
| 730 "ime/composition_text_util_pango_unittest.cc", | |
| 731 "ime/input_method_base_unittest.cc", | |
| 732 "ime/input_method_chromeos_unittest.cc", | |
| 733 "ime/remote_input_method_win_unittest.cc", | |
| 734 "ime/win/imm32_manager_unittest.cc", | |
| 735 "ime/win/tsf_input_scope_unittest.cc", | |
| 736 ] | |
| 737 } | |
| 738 | |
| 726 if (is_ios) { | 739 if (is_ios) { |
| 727 # Compile this Mac file on iOS as well. | 740 # Compile this Mac file on iOS as well. |
| 728 set_sources_assignment_filter([]) | 741 set_sources_assignment_filter([]) |
| 729 sources += [ "l10n/l10n_util_mac_unittest.mm" ] | 742 sources += [ "l10n/l10n_util_mac_unittest.mm" ] |
| 730 set_sources_assignment_filter(sources_assignment_filter) | 743 set_sources_assignment_filter(sources_assignment_filter) |
| 731 } else { # !is_ios | 744 } else { # !is_ios |
| 732 sources += [ | 745 sources += [ |
| 733 "accelerators/accelerator_manager_unittest.cc", | 746 "accelerators/accelerator_manager_unittest.cc", |
| 734 "accelerators/menu_label_accelerator_util_linux_unittest.cc", | 747 "accelerators/menu_label_accelerator_util_linux_unittest.cc", |
| 735 "clipboard/custom_data_helper_unittest.cc", | 748 "clipboard/custom_data_helper_unittest.cc", |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 760 # These were already removed in the chromeos case. | 773 # These were already removed in the chromeos case. |
| 761 sources -= [ | 774 sources -= [ |
| 762 "ime/chromeos/character_composer_unittest.cc", | 775 "ime/chromeos/character_composer_unittest.cc", |
| 763 "ime/input_method_chromeos_unittest.cc", | 776 "ime/input_method_chromeos_unittest.cc", |
| 764 ] | 777 ] |
| 765 } | 778 } |
| 766 sources -= [ "ime/composition_text_util_pango_unittest.cc" ] | 779 sources -= [ "ime/composition_text_util_pango_unittest.cc" ] |
| 767 } | 780 } |
| 768 } | 781 } |
| 769 | 782 |
| 770 if (build_ime) { | |
| 771 sources += [ | |
| 772 "ime/candidate_window_unittest.cc", | |
| 773 "ime/chromeos/character_composer_unittest.cc", | |
| 774 "ime/composition_text_util_pango_unittest.cc", | |
| 775 "ime/input_method_base_unittest.cc", | |
| 776 "ime/input_method_chromeos_unittest.cc", | |
| 777 "ime/remote_input_method_win_unittest.cc", | |
| 778 "ime/win/imm32_manager_unittest.cc", | |
| 779 "ime/win/tsf_input_scope_unittest.cc", | |
| 780 ] | |
| 781 } | |
| 782 | |
| 783 deps = [ | 783 deps = [ |
| 784 "//base", | 784 "//base", |
| 785 "//base/allocator", | 785 "//base/allocator", |
| 786 "//base/test:test_support", | 786 "//base/test:test_support", |
| 787 "//net", | 787 "//net", |
| 788 "//skia", | 788 "//skia", |
| 789 "//testing/gmock", | 789 "//testing/gmock", |
| 790 "//testing/gtest", | 790 "//testing/gtest", |
| 791 "//third_party/icu", | 791 "//third_party/icu", |
| 792 "//ui/base", | 792 "//ui/base", |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 892 deps += [ | 892 deps += [ |
| 893 "//ui/aura:test_support", | 893 "//ui/aura:test_support", |
| 894 "//ui/events:gesture_detection", | 894 "//ui/events:gesture_detection", |
| 895 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP) | 895 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP) |
| 896 #'chromeos/ui_chromeos.gyp:ui_chromeos', | 896 #'chromeos/ui_chromeos.gyp:ui_chromeos', |
| 897 ] | 897 ] |
| 898 } | 898 } |
| 899 } | 899 } |
| 900 } | 900 } |
| 901 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). | 901 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). |
| OLD | NEW |