Chromium Code Reviews Chromium Code Reviews
Issue 727143002:
Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 component("ui_chromeos") { | 5 component("ui_chromeos") { |
| 6 sources = [ | |
| 7 "accessibility_types.h", | |
| 8 "ime/candidate_view.cc", | |
| 9 "ime/candidate_view.h", | |
| 10 "ime/candidate_window_view.cc", | |
| 11 "ime/candidate_window_view.h", | |
| 12 "ime/infolist_window.cc", | |
| 13 "ime/infolist_window.h", | |
| 14 "ime/input_method_menu_item.cc", | |
| 15 "ime/input_method_menu_item.h", | |
| 16 "ime/input_method_menu_manager.cc", | |
| 17 "ime/input_method_menu_manager.h", | |
| 18 "ime/mode_indicator_view.cc", | |
| 19 "ime/mode_indicator_view.h", | |
| 20 "network/network_connect.cc", | |
| 21 "network/network_connect.h", | |
| 22 "network/network_icon.cc", | |
| 23 "network/network_icon.h", | |
| 24 "network/network_icon_animation.cc", | |
| 25 "network/network_icon_animation.h", | |
| 26 "network/network_icon_animation_observer.h", | |
| 27 "network/network_info.cc", | |
| 28 "network/network_info.h", | |
| 29 "network/network_list.cc", | |
| 30 "network/network_list.h", | |
| 31 "network/network_list_delegate.h", | |
| 32 "network/network_state_notifier.cc", | |
| 33 "network/network_state_notifier.h", | |
| 34 "touch_exploration_controller.cc", | |
| 35 "touch_exploration_controller.h", | |
| 36 "user_activity_power_manager_notifier.cc", | |
| 37 "user_activity_power_manager_notifier.h", | |
| 38 ] | |
| 39 deps = [ | 6 deps = [ |
| 40 "//base", | 7 "//base", |
| 41 "//base/third_party/dynamic_annotations", | 8 "//base/third_party/dynamic_annotations", |
| 9 "//chromeos:chromeos", | |
| 42 "//chromeos:power_manager_proto", | 10 "//chromeos:power_manager_proto", |
| 43 "//skia", | 11 "//skia", |
| 44 "//ui/aura", | 12 "//ui/aura", |
| 45 "//ui/chromeos/resources", | 13 "//ui/chromeos/resources", |
| 46 "//ui/chromeos/strings", | 14 "//ui/chromeos/strings", |
| 15 "//ui/chromeos:ui_chromeos_ime", | |
| 16 "//ui/chromeos:ui_chromeos_ime_view", | |
|
Jun Mukai
2014/11/20 07:34:14
can't find this target.
Shu Chen
2014/11/20 08:34:38
Done. New solution no longer such this file.
| |
| 47 "//ui/events", | 17 "//ui/events", |
| 48 "//ui/events:gesture_detection", | 18 "//ui/events:gesture_detection", |
| 49 "//ui/message_center", | 19 "//ui/message_center", |
| 50 "//ui/views", | 20 "//ui/views", |
| 51 "//ui/wm", | 21 "//ui/wm", |
| 52 ] | 22 ] |
| 23 sources = gypi_values.ui_chromeos_sources | |
| 53 defines = [ "UI_CHROMEOS_IMPLEMENTATION" ] | 24 defines = [ "UI_CHROMEOS_IMPLEMENTATION" ] |
| 54 } | 25 } |
| 26 | |
| 27 component("ui_chromeos_ime") { | |
|
Jun Mukai
2014/11/20 07:34:14
If target is split and all files are under ime/, y
Shu Chen
2014/11/20 08:34:38
Done. New solution no longer such this file.
| |
| 28 deps = [ | |
| 29 "//base", | |
| 30 "//skia", | |
| 31 "//chromeos:chromeos", | |
| 32 ] | |
| 33 sources = gypi_values.ui_chromeos_ime_model_sources | |
| 34 if (use_x11) { | |
| 35 configs += [ "//build/config/linux:x11" ] | |
| 36 deps += [ "//ui/gfx/x" ] | |
| 37 sources -= [ | |
| 38 "ime/ime_keyboard_ozone.cc", | |
| 39 "ime/ime_keyboard_ozone.h", | |
| 40 ] | |
| 41 } else { | |
| 42 sources -= [ | |
| 43 "ime/ime_keyboard_x11.cc", | |
| 44 "ime/ime_keyboard_x11.h", | |
| 45 ] | |
| 46 } | |
| 47 } | |
| OLD | NEW |
