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

Side by Side Diff: ui/base/BUILD.gn

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed solution: move chromeos/ime to ui/base/ime/chromeos. Created 6 years, 1 month 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
OLDNEW
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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 "window_open_disposition.h", 267 "window_open_disposition.h",
268 "work_area_watcher_observer.h", 268 "work_area_watcher_observer.h",
269 ] 269 ]
270 270
271 if (is_win) { 271 if (is_win) {
272 sources += [ "touch/touch_device_win.cc" ] 272 sources += [ "touch/touch_device_win.cc" ]
273 } else if (is_android) { 273 } else if (is_android) {
274 sources += [ "touch/touch_device_android.cc" ] 274 sources += [ "touch/touch_device_android.cc" ]
275 } else if (use_ozone) { 275 } else if (use_ozone) {
276 sources += [ "touch/touch_device_ozone.cc" ] 276 sources += [ "touch/touch_device_ozone.cc" ]
277 } else if (use_aura && use_x11) { 277 } else if (use_aura && use_x11) {
278 sources += [ "touch/touch_device_aurax11.cc" ] 278 sources += [ "touch/touch_device_aurax11.cc" ]
279 } else { 279 } else {
280 # Empty implementation for all other cases. 280 # Empty implementation for all other cases.
281 sources += [ "touch/touch_device.cc" ] 281 sources += [ "touch/touch_device.cc" ]
282 } 282 }
283 283
284 defines = [ "UI_BASE_IMPLEMENTATION" ] 284 defines = [ "UI_BASE_IMPLEMENTATION" ]
285 285
286 public_deps = [ 286 public_deps = [
287 "//base", 287 "//base",
(...skipping 29 matching lines...) Expand all
317 "ime/chromeos/ime_bridge.cc", 317 "ime/chromeos/ime_bridge.cc",
318 "ime/chromeos/ime_bridge.h", 318 "ime/chromeos/ime_bridge.h",
319 "ime/chromeos/ime_keymap.cc", 319 "ime/chromeos/ime_keymap.cc",
320 "ime/chromeos/ime_keymap.h", 320 "ime/chromeos/ime_keymap.h",
321 "ime/chromeos/mock_ime_candidate_window_handler.cc", 321 "ime/chromeos/mock_ime_candidate_window_handler.cc",
322 "ime/chromeos/mock_ime_candidate_window_handler.h", 322 "ime/chromeos/mock_ime_candidate_window_handler.h",
323 "ime/chromeos/mock_ime_engine_handler.cc", 323 "ime/chromeos/mock_ime_engine_handler.cc",
324 "ime/chromeos/mock_ime_engine_handler.h", 324 "ime/chromeos/mock_ime_engine_handler.h",
325 "ime/chromeos/mock_ime_input_context_handler.cc", 325 "ime/chromeos/mock_ime_input_context_handler.cc",
326 "ime/chromeos/mock_ime_input_context_handler.h", 326 "ime/chromeos/mock_ime_input_context_handler.h",
327 "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.
328 "ime/chromeos/component_extension_ime_manager.h",
329 "ime/chromeos/composition_text.cc",
330 "ime/chromeos/composition_text.h",
331 "ime/chromeos/extension_ime_util.cc",
332 "ime/chromeos/extension_ime_util.h",
333 "ime/chromeos/fake_ime_keyboard.cc",
334 "ime/chromeos/fake_ime_keyboard.h",
335 "ime/chromeos/ime_keyboard.cc",
336 "ime/chromeos/ime_keyboard.h",
337 "ime/chromeos/ime_keyboard_ozone.cc",
338 "ime/chromeos/ime_keyboard_ozone.h",
339 "ime/chromeos/ime_keyboard_x11.cc",
340 "ime/chromeos/ime_keyboard_x11.h",
341 "ime/chromeos/input_method_delegate.h",
342 "ime/chromeos/input_method_descriptor.cc",
343 "ime/chromeos/input_method_descriptor.h",
344 "ime/chromeos/input_method_manager.cc",
345 "ime/chromeos/input_method_manager.h",
346 "ime/chromeos/input_method_whitelist.cc",
347 "ime/chromeos/input_method_whitelist.h",
327 "ime/composition_text.cc", 348 "ime/composition_text.cc",
328 "ime/composition_text.h", 349 "ime/composition_text.h",
329 "ime/composition_text_util_pango.cc", 350 "ime/composition_text_util_pango.cc",
330 "ime/composition_text_util_pango.h", 351 "ime/composition_text_util_pango.h",
331 "ime/composition_underline.h", 352 "ime/composition_underline.h",
332 "ime/dummy_input_method_delegate.cc", 353 "ime/dummy_input_method_delegate.cc",
333 "ime/dummy_input_method_delegate.h", 354 "ime/dummy_input_method_delegate.h",
334 "ime/infolist_entry.cc", 355 "ime/infolist_entry.cc",
335 "ime/infolist_entry.h", 356 "ime/infolist_entry.h",
336 "ime/input_method.h", 357 "ime/input_method.h",
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 ] 910 ]
890 911
891 deps += [ 912 deps += [
892 "//ui/events", 913 "//ui/events",
893 "//ui/events/platform", 914 "//ui/events/platform",
894 ] 915 ]
895 } 916 }
896 917
897 if (is_chromeos) { 918 if (is_chromeos) {
898 sources += [ 919 sources += [
899 # TODO(pkotwicz): Move tests to their own target (crbug.com/432538) 920 # TODO(pkotwicz): Move tests to their own target (crbug.com/432538)
900 "../chromeos/ime/candidate_view_unittest.cc", 921 "../chromeos/ime/candidate_view_unittest.cc",
901 "../chromeos/ime/candidate_window_view_unittest.cc", 922 "../chromeos/ime/candidate_window_view_unittest.cc",
902 "../chromeos/ime/input_method_menu_item_unittest.cc", 923 "../chromeos/ime/input_method_menu_item_unittest.cc",
903 "../chromeos/ime/input_method_menu_manager_unittest.cc", 924 "../chromeos/ime/input_method_menu_manager_unittest.cc",
904 "../chromeos/network/network_state_notifier_unittest.cc", 925 "../chromeos/network/network_state_notifier_unittest.cc",
905 "../chromeos/touch_exploration_controller_unittest.cc", 926 "../chromeos/touch_exploration_controller_unittest.cc",
906 ] 927 ]
907 sources -= [ 928 sources -= [
908 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", 929 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
909 "x/selection_requestor_unittest.cc", 930 "x/selection_requestor_unittest.cc",
910 ] 931 ]
911 deps += [ 932 deps += [
912 "//chromeos", 933 "//chromeos",
913 "//ui/aura:test_support", 934 "//ui/aura:test_support",
914 "//ui/chromeos/resources", 935 "//ui/chromeos/resources",
915 "//ui/chromeos/strings", 936 "//ui/chromeos/strings",
916 "//ui/chromeos:ui_chromeos", 937 "//ui/chromeos:ui_chromeos",
917 "//ui/events:gesture_detection", 938 "//ui/events:gesture_detection",
918 "//ui/message_center:message_center", 939 "//ui/message_center:message_center",
919 "//ui/views", 940 "//ui/views",
920 "//ui/views:test_support", 941 "//ui/views:test_support",
921 ] 942 ]
922 } 943 }
923 } 944 }
924 } 945 }
925 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). 946 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698