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

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

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | ui/base/DEPS » ('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 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 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 ] 888 ]
889 889
890 deps += [ 890 deps += [
891 "//ui/events", 891 "//ui/events",
892 "//ui/events/platform", 892 "//ui/events/platform",
893 ] 893 ]
894 } 894 }
895 895
896 if (is_chromeos) { 896 if (is_chromeos) {
897 sources += [ 897 sources += [
898 # TODO(pkotwicz): Move tests to their own target (crbug.com/432538)
899 "../chromeos/ime/candidate_view_unittest.cc",
900 "../chromeos/ime/candidate_window_view_unittest.cc",
901 "../chromeos/ime/input_method_menu_item_unittest.cc",
902 "../chromeos/ime/input_method_menu_manager_unittest.cc",
898 "../chromeos/network/network_state_notifier_unittest.cc", 903 "../chromeos/network/network_state_notifier_unittest.cc",
899 "../chromeos/touch_exploration_controller_unittest.cc", 904 "../chromeos/touch_exploration_controller_unittest.cc",
900 ] 905 ]
901 sources -= [ 906 sources -= [
902 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", 907 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
903 "x/selection_requestor_unittest.cc", 908 "x/selection_requestor_unittest.cc",
904 ] 909 ]
905 deps += [ 910 deps += [
906 "//chromeos", 911 "//chromeos",
907 "//ui/aura:test_support", 912 "//ui/aura:test_support",
908 "//ui/chromeos/resources", 913 "//ui/chromeos/resources",
909 "//ui/chromeos/strings", 914 "//ui/chromeos/strings",
910 "//ui/chromeos:ui_chromeos", 915 "//ui/chromeos:ui_chromeos",
911 "//ui/events:gesture_detection", 916 "//ui/events:gesture_detection",
912 "//ui/message_center:message_center", 917 "//ui/message_center:message_center",
918 "//ui/views",
sky 2014/11/14 17:56:04 This is wrong and means there is a cycle between v
oshima 2014/11/14 19:52:11 This is for the test target, so it won't introduce
919 "//ui/views:test_support",
913 ] 920 ]
914 } 921 }
915 } 922 }
916 } 923 }
917 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). 924 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | ui/base/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698