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

Unified Diff: ui/chromeos/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: nit 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 side-by-side diff with in-line comments
Download patch
Index: ui/chromeos/BUILD.gn
diff --git a/ui/chromeos/BUILD.gn b/ui/chromeos/BUILD.gn
index 9c27cde2cde6c5214ea055c9f02abf4148feef81..9054fafd4a67fcc6ea805b2a372256b2bc963958 100644
--- a/ui/chromeos/BUILD.gn
+++ b/ui/chromeos/BUILD.gn
@@ -3,52 +3,45 @@
# found in the LICENSE file.
component("ui_chromeos") {
- sources = [
- "accessibility_types.h",
- "ime/candidate_view.cc",
- "ime/candidate_view.h",
- "ime/candidate_window_view.cc",
- "ime/candidate_window_view.h",
- "ime/infolist_window.cc",
- "ime/infolist_window.h",
- "ime/input_method_menu_item.cc",
- "ime/input_method_menu_item.h",
- "ime/input_method_menu_manager.cc",
- "ime/input_method_menu_manager.h",
- "ime/mode_indicator_view.cc",
- "ime/mode_indicator_view.h",
- "network/network_connect.cc",
- "network/network_connect.h",
- "network/network_icon.cc",
- "network/network_icon.h",
- "network/network_icon_animation.cc",
- "network/network_icon_animation.h",
- "network/network_icon_animation_observer.h",
- "network/network_info.cc",
- "network/network_info.h",
- "network/network_list.cc",
- "network/network_list.h",
- "network/network_list_delegate.h",
- "network/network_state_notifier.cc",
- "network/network_state_notifier.h",
- "touch_exploration_controller.cc",
- "touch_exploration_controller.h",
- "user_activity_power_manager_notifier.cc",
- "user_activity_power_manager_notifier.h",
- ]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
+ "//chromeos:chromeos",
"//chromeos:power_manager_proto",
"//skia",
"//ui/aura",
"//ui/chromeos/resources",
"//ui/chromeos/strings",
+ "//ui/chromeos:ui_chromeos_ime",
+ "//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.
"//ui/events",
"//ui/events:gesture_detection",
"//ui/message_center",
"//ui/views",
"//ui/wm",
]
+ sources = gypi_values.ui_chromeos_sources
defines = [ "UI_CHROMEOS_IMPLEMENTATION" ]
}
+
+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.
+ deps = [
+ "//base",
+ "//skia",
+ "//chromeos:chromeos",
+ ]
+ sources = gypi_values.ui_chromeos_ime_model_sources
+ if (use_x11) {
+ configs += [ "//build/config/linux:x11" ]
+ deps += [ "//ui/gfx/x" ]
+ sources -= [
+ "ime/ime_keyboard_ozone.cc",
+ "ime/ime_keyboard_ozone.h",
+ ]
+ } else {
+ sources -= [
+ "ime/ime_keyboard_x11.cc",
+ "ime/ime_keyboard_x11.h",
+ ]
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698