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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ui_base.gyp

Issue 895363005: Revert of Split ui/base/ime into a new component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « ui/base/ime/win/tsf_input_scope.h ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 1d7614cd599e29f11debecf766f145683f3d2fb2..3b004735246bd26393b3ca62b5a8d6652cae4199 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -200,6 +200,94 @@
'idle/idle_win.cc',
'idle/screensaver_window_finder_x11.cc',
'idle/screensaver_window_finder_x11.h',
+ 'ime/candidate_window.cc',
+ 'ime/candidate_window.h',
+ 'ime/chromeos/character_composer.cc',
+ 'ime/chromeos/character_composer.h',
+ 'ime/chromeos/component_extension_ime_manager.cc',
+ 'ime/chromeos/component_extension_ime_manager.h',
+ 'ime/chromeos/composition_text.cc',
+ 'ime/chromeos/composition_text.h',
+ 'ime/chromeos/extension_ime_util.cc',
+ 'ime/chromeos/extension_ime_util.h',
+ 'ime/chromeos/fake_ime_keyboard.cc',
+ 'ime/chromeos/fake_ime_keyboard.h',
+ 'ime/chromeos/fake_input_method_delegate.cc',
+ 'ime/chromeos/fake_input_method_delegate.h',
+ 'ime/chromeos/ime_bridge.cc',
+ 'ime/chromeos/ime_bridge.h',
+ 'ime/chromeos/ime_keyboard.cc',
+ 'ime/chromeos/ime_keyboard.h',
+ 'ime/chromeos/ime_keyboard_ozone.cc',
+ 'ime/chromeos/ime_keyboard_ozone.h',
+ 'ime/chromeos/ime_keyboard_x11.cc',
+ 'ime/chromeos/ime_keyboard_x11.h',
+ 'ime/chromeos/ime_keymap.cc',
+ 'ime/chromeos/ime_keymap.h',
+ 'ime/chromeos/input_method_delegate.h',
+ 'ime/chromeos/input_method_descriptor.cc',
+ 'ime/chromeos/input_method_descriptor.h',
+ 'ime/chromeos/input_method_manager.cc',
+ 'ime/chromeos/input_method_manager.h',
+ 'ime/chromeos/input_method_whitelist.cc',
+ 'ime/chromeos/input_method_whitelist.h',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.cc',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.h',
+ 'ime/chromeos/mock_ime_candidate_window_handler.cc',
+ 'ime/chromeos/mock_ime_candidate_window_handler.h',
+ 'ime/chromeos/mock_ime_engine_handler.cc',
+ 'ime/chromeos/mock_ime_engine_handler.h',
+ 'ime/chromeos/mock_ime_input_context_handler.cc',
+ 'ime/chromeos/mock_ime_input_context_handler.h',
+ 'ime/composition_text.cc',
+ 'ime/composition_text.h',
+ 'ime/composition_text_util_pango.cc',
+ 'ime/composition_text_util_pango.h',
+ 'ime/composition_underline.h',
+ 'ime/dummy_input_method_delegate.cc',
+ 'ime/dummy_input_method_delegate.h',
+ 'ime/infolist_entry.cc',
+ 'ime/infolist_entry.h',
+ 'ime/input_method.h',
+ 'ime/input_method_auralinux.cc',
+ 'ime/input_method_auralinux.h',
+ 'ime/input_method_base.cc',
+ 'ime/input_method_base.h',
+ 'ime/input_method_chromeos.cc',
+ 'ime/input_method_chromeos.h',
+ 'ime/input_method_delegate.h',
+ 'ime/input_method_factory.cc',
+ 'ime/input_method_factory.h',
+ 'ime/input_method_initializer.cc',
+ 'ime/input_method_initializer.h',
+ 'ime/input_method_mac.h',
+ 'ime/input_method_mac.mm',
+ 'ime/input_method_minimal.cc',
+ 'ime/input_method_minimal.h',
+ 'ime/input_method_observer.h',
+ 'ime/input_method_win.cc',
+ 'ime/input_method_win.h',
+ 'ime/linux/fake_input_method_context.cc',
+ 'ime/linux/fake_input_method_context.h',
+ 'ime/linux/fake_input_method_context_factory.cc',
+ 'ime/linux/fake_input_method_context_factory.h',
+ 'ime/linux/linux_input_method_context.h',
+ 'ime/linux/linux_input_method_context_factory.cc',
+ 'ime/linux/linux_input_method_context_factory.h',
+ 'ime/mock_input_method.cc',
+ 'ime/mock_input_method.h',
+ 'ime/remote_input_method_delegate_win.h',
+ 'ime/remote_input_method_win.cc',
+ 'ime/remote_input_method_win.h',
+ 'ime/text_input_client.cc',
+ 'ime/text_input_client.h',
+ 'ime/text_input_focus_manager.cc',
+ 'ime/text_input_focus_manager.h',
+ 'ime/text_input_type.h',
+ 'ime/win/imm32_manager.cc',
+ 'ime/win/imm32_manager.h',
+ 'ime/win/tsf_input_scope.cc',
+ 'ime/win/tsf_input_scope.h',
'l10n/formatter.cc',
'l10n/formatter.h',
'l10n/l10n_font_util.cc',
@@ -494,6 +582,7 @@
},
'link_settings': {
'libraries': [
+ '-limm32.lib',
'-ld2d1.lib',
'-ldwmapi.lib',
'-loleacc.lib',
@@ -617,6 +706,14 @@
# ui to be a hard dependency for all its users.
'hard_dependency': 1,
}],
+ ['toolkit_views==0 and use_aura==0', {
+ 'sources!': [
+ 'ime/input_method_factory.cc',
+ 'ime/input_method_factory.h',
+ 'ime/input_method_minimal.cc',
+ 'ime/input_method_minimal.h',
+ ],
+ }],
['chromeos==1', {
'dependencies': [
'../../chromeos/chromeos.gyp:chromeos',
@@ -627,6 +724,31 @@
'idle/idle_query_x11.h',
'idle/screensaver_window_finder_x11.cc',
'idle/screensaver_window_finder_x11.h',
+ ],
+ }],
+ ['OS!="win"', {
+ 'sources!': [
+ 'ime/input_method_imm32.cc',
+ 'ime/input_method_imm32.h',
+ ],
+ }],
+ ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
+ 'sources!': [
+ 'ime/input_method_auralinux.cc',
+ 'ime/input_method_auralinux.h',
+ 'ime/linux/fake_input_method_context.cc',
+ 'ime/linux/fake_input_method_context.h',
+ 'ime/linux/fake_input_method_context_factory.cc',
+ 'ime/linux/fake_input_method_context_factory.h',
+ 'ime/linux/linux_input_method_context.h',
+ 'ime/linux/linux_input_method_context_factory.cc',
+ 'ime/linux/linux_input_method_context_factory.h',
+ ],
+ }],
+ ['use_x11==0', {
+ 'sources!': [
+ 'ime/composition_text_util_pango.cc',
+ 'ime/composition_text_util_pango.h',
],
}],
],
@@ -658,9 +780,6 @@
'conditions': [
['OS!="ios"', {
'type': 'static_library',
- 'dependecies': [
- 'ime/ui_base_ime.gyp:ui_base_ime',
- ],
'sources': [
'ime/dummy_input_method.cc',
'ime/dummy_input_method.h',
« no previous file with comments | « ui/base/ime/win/tsf_input_scope.h ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698