Chromium Code Reviews| Index: ui/base/BUILD.gn |
| diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn |
| index 07dbec017a16a10c223862a92b1873d15b4fb352..cdb4cb0e796e427345f040c8c6b5bb0e8a5e4584 100644 |
| --- a/ui/base/BUILD.gn |
| +++ b/ui/base/BUILD.gn |
| @@ -274,7 +274,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. |
| @@ -324,6 +324,27 @@ component("base") { |
| "ime/chromeos/mock_ime_engine_handler.h", |
| "ime/chromeos/mock_ime_input_context_handler.cc", |
| "ime/chromeos/mock_ime_input_context_handler.h", |
| + "ime/chromeos/component_extension_ime_manager.cc", |
|
Yuki
2014/11/20 09:23:03
nit: Could you sort files in alphabetical order?
Yuki
2014/11/20 14:52:16
It seems this hasn't been got done yet.
Shu Chen
2014/11/20 15:21:39
Done.
|
| + "ime/chromeos/component_extension_ime_manager.h", |
| + "ime/chromeos/composition_text.cc", |
| + "ime/chromeos/composition_text.h", |
| + "ime/chromeos/extension_ime_util.cc", |
| + "ime/chromeos/extension_ime_util.h", |
| + "ime/chromeos/fake_ime_keyboard.cc", |
| + "ime/chromeos/fake_ime_keyboard.h", |
| + "ime/chromeos/ime_keyboard.cc", |
| + "ime/chromeos/ime_keyboard.h", |
| + "ime/chromeos/ime_keyboard_ozone.cc", |
| + "ime/chromeos/ime_keyboard_ozone.h", |
| + "ime/chromeos/ime_keyboard_x11.cc", |
| + "ime/chromeos/ime_keyboard_x11.h", |
| + "ime/chromeos/input_method_delegate.h", |
| + "ime/chromeos/input_method_descriptor.cc", |
| + "ime/chromeos/input_method_descriptor.h", |
| + "ime/chromeos/input_method_manager.cc", |
| + "ime/chromeos/input_method_manager.h", |
| + "ime/chromeos/input_method_whitelist.cc", |
| + "ime/chromeos/input_method_whitelist.h", |
| "ime/composition_text.cc", |
| "ime/composition_text.h", |
| "ime/composition_text_util_pango.cc", |
| @@ -896,7 +917,7 @@ test("ui_unittests") { |
| if (is_chromeos) { |
| sources += [ |
| - # TODO(pkotwicz): Move tests to their own target (crbug.com/432538) |
| + # TODO(pkotwicz): Move tests to their own target (crbug.com/432538) |
| "../chromeos/ime/candidate_view_unittest.cc", |
| "../chromeos/ime/candidate_window_view_unittest.cc", |
| "../chromeos/ime/input_method_menu_item_unittest.cc", |