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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/chromeos/ui_chromeos.gyp

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: add ui/chromeos/ime/DEPS 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
« ui/chromeos/DEPS ('K') | « ui/chromeos/ime/view/mode_indicator_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/ui_chromeos.gyp
diff --git a/ui/chromeos/ui_chromeos.gyp b/ui/chromeos/ui_chromeos.gyp
index dd3ae803e5cfbb3cd1908c3c7b62a62f32020ca6..84eb36b639738f436755b77ec2cc04bfb8ff8dbe 100644
--- a/ui/chromeos/ui_chromeos.gyp
+++ b/ui/chromeos/ui_chromeos.gyp
@@ -5,6 +5,66 @@
{
'variables': {
'chromium_code': 1,
+ 'ui_chromeos_ime_model_sources': [
+ 'ime/component_extension_ime_manager.cc',
+ 'ime/component_extension_ime_manager.h',
+ 'ime/composition_text.cc',
+ 'ime/composition_text.h',
+ 'ime/extension_ime_util.cc',
+ 'ime/extension_ime_util.h',
+ 'ime/fake_ime_keyboard.cc',
+ 'ime/fake_ime_keyboard.h',
+ 'ime/ime_keyboard.cc',
+ 'ime/ime_keyboard.h',
+ 'ime/ime_keyboard_ozone.cc',
+ 'ime/ime_keyboard_ozone.h',
+ 'ime/ime_keyboard_x11.cc',
+ 'ime/ime_keyboard_x11.h',
+ 'ime/input_method_delegate.h',
+ 'ime/input_method_descriptor.cc',
+ 'ime/input_method_descriptor.h',
+ 'ime/input_method_manager.cc',
+ 'ime/input_method_manager.h',
+ 'ime/input_method_whitelist.cc',
+ 'ime/input_method_whitelist.h',
+ ],
+ 'ui_chromeos_ime_view_sources': [
+ 'ime/view/candidate_view.cc',
+ 'ime/view/candidate_view.h',
+ 'ime/view/candidate_window_view.cc',
+ 'ime/view/candidate_window_view.h',
+ 'ime/view/infolist_window.cc',
+ 'ime/view/infolist_window.h',
+ 'ime/view/input_method_menu_item.cc',
+ 'ime/view/input_method_menu_item.h',
+ 'ime/view/input_method_menu_manager.cc',
+ 'ime/view/input_method_menu_manager.h',
+ 'ime/view/mode_indicator_view.cc',
+ 'ime/view/mode_indicator_view.h',
+ ],
+ 'ui_chromeos_sources': [
+ 'accessibility_types.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',
+ '<@(ui_chromeos_ime_model_sources',
+ '<@(ui_chromeos_ime_view_sources',
+ ],
},
'targets': [
{
@@ -42,10 +102,38 @@
'includes': [ '../../build/grit_target.gypi' ],
}, # target_name: ui_chromeos_strings
{
- 'target_name': 'ui_chromeos',
+ 'target_name': 'ui_chromeos_ime',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ '../../skia/skia.gyp:skia',
+ '../../chromeos/chromeos.gyp:chromeos',
stevenjb 2014/11/19 18:57:38 Does ui_chromeos_ime actually depend on chromeos/
Shu Chen 2014/11/20 01:04:44 Yes, it depends on the generated header: chromeos/
+ ],
+ 'sources': [ '<@(ui_chromeos_ime_model_sources)' ],
+ 'conditions': [
+ ['use_x11 == 1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:x11',
+ '../gfx/x/gfx_x11.gyp:gfx_x11',
+ ],
+ }],
+ ],
+ }, # target_name: ui_chromeos_ime
+ {
+ 'target_name': 'ui_chromeos_ime_view',
'type': '<(component)',
'dependencies': [
'../../base/base.gyp:base',
+ '../../skia/skia.gyp:skia',
+ '../views/views.gyp:views',
+ '../wm/wm.gyp:wm',
+ ],
+ 'sources': [ '<@(ui_chromeos_ime_view_sources)' ],
+ }, # target_name: ui_chromeos_ime_view
+ {
+ 'target_name': 'ui_chromeos',
+ 'type': '<(component)',
+ 'dependencies': [
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../chromeos/chromeos.gyp:power_manager_proto',
'../../skia/skia.gyp:skia',
@@ -53,47 +141,28 @@
'../events/events.gyp:events',
'../events/events.gyp:gesture_detection',
'../message_center/message_center.gyp:message_center',
- '../views/views.gyp:views',
- '../wm/wm.gyp:wm',
+ 'ui_chromeos_ime',
+ 'ui_chromeos_ime_view',
'ui_chromeos_resources',
'ui_chromeos_strings',
],
'defines': [
'UI_CHROMEOS_IMPLEMENTATION',
],
+ 'sources': [ '<@(ui_chromeos_sources)' ],
+ }, # target_name: ui_chromeos
+ {
+ 'target_name': 'ui_chromeos_ime_test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'ui_chromeos_ime',
+ ],
'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',
+ '../chromeos/ime/mock_component_extension_ime_manager_delegate.cc',
+ '../chromeos/ime/mock_component_extension_ime_manager_delegate.h',
+ '../chromeos/ime/fake_input_method_delegate.cc',
+ '../chromeos/ime/fake_input_method_delegate.h',
],
- }, # target_name: ui_chromeos
+ }, # target_name: ui_chromeos_ime_test_support
],
}
« ui/chromeos/DEPS ('K') | « ui/chromeos/ime/view/mode_indicator_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698