Chromium Code Reviews| Index: ui/base/BUILD.gn |
| diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn |
| index 80db6988394e85ef2bc8b6f8dfbf16933f84dd9b..e8e83e589f57f94984ffd4f203c9aab3d8112da3 100644 |
| --- a/ui/base/BUILD.gn |
| +++ b/ui/base/BUILD.gn |
| @@ -273,7 +273,7 @@ component("base") { |
| sources += [ "touch/touch_device_android.cc" ] |
| } else if (use_ozone) { |
| sources += [ "touch/touch_device_ozone.cc" ] |
| - } else if (use_aura && use_x11) { |
| + } else if (use_aura && use_x11) { |
| sources += [ "touch/touch_device_aurax11.cc" ] |
| } else { |
| # Empty implementation for all other cases. |
| @@ -723,6 +723,19 @@ test("unittests") { |
| "test/run_all_unittests.cc", |
| ] |
| + 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
|
| + sources += [ |
| + "ime/candidate_window_unittest.cc", |
| + "ime/chromeos/character_composer_unittest.cc", |
| + "ime/composition_text_util_pango_unittest.cc", |
| + "ime/input_method_base_unittest.cc", |
| + "ime/input_method_chromeos_unittest.cc", |
| + "ime/remote_input_method_win_unittest.cc", |
| + "ime/win/imm32_manager_unittest.cc", |
| + "ime/win/tsf_input_scope_unittest.cc", |
| + ] |
| + } |
| + |
| if (is_ios) { |
| # Compile this Mac file on iOS as well. |
| set_sources_assignment_filter([]) |
| @@ -767,19 +780,6 @@ test("unittests") { |
| } |
| } |
| - if (build_ime) { |
| - sources += [ |
| - "ime/candidate_window_unittest.cc", |
| - "ime/chromeos/character_composer_unittest.cc", |
| - "ime/composition_text_util_pango_unittest.cc", |
| - "ime/input_method_base_unittest.cc", |
| - "ime/input_method_chromeos_unittest.cc", |
| - "ime/remote_input_method_win_unittest.cc", |
| - "ime/win/imm32_manager_unittest.cc", |
| - "ime/win/tsf_input_scope_unittest.cc", |
| - ] |
| - } |
| - |
| deps = [ |
| "//base", |
| "//base/allocator", |