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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ui_base.gyp

Issue 365303003: ui: Fold ime gypi files directly into their main targets (ui_base and ui_unittests). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify - fix mac? Created 6 years, 5 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/ime_unittests.gypi ('k') | ui/ui_unittests.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 59c79fd8f0ef27958ebf968b3046533d9bfd0575..c9848341f995503a1b7b4ad662d3dbc10cbcacfe 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -21,6 +21,7 @@
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
'../../url/url.gyp:url_lib',
+ '../events/events.gyp:events',
'../events/events.gyp:events_base',
'../events/platform/events_platform.gyp:events_platform',
'../gfx/gfx.gyp:gfx',
@@ -176,6 +177,69 @@
'dragdrop/os_exchange_data_provider_win.cc',
'dragdrop/os_exchange_data_provider_win.h',
'hit_test.h',
+ 'ime/candidate_window.cc',
+ 'ime/candidate_window.h',
+ 'ime/chromeos/character_composer.cc',
+ 'ime/chromeos/character_composer.h',
+ 'ime/chromeos/ime_bridge.cc',
+ 'ime/chromeos/ime_bridge.h',
+ 'ime/chromeos/ime_keymap.cc',
+ 'ime/chromeos/ime_keymap.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',
@@ -319,11 +383,7 @@
}],
],
'conditions': [
- ['OS!="ios"', {
- 'includes': [
- 'ime/ime.gypi',
- ],
- }, { # OS=="ios"
+ ['OS=="ios"', {
# iOS only uses a subset of UI.
'sources/': [
['exclude', '\\.(cc|mm)$'],
@@ -340,20 +400,12 @@
],
},
}],
- ['toolkit_views==1', {
- 'dependencies': [
- '../events/events.gyp:events',
- ],
- }],
['use_aura==1', {
'sources/': [
['exclude', 'clipboard/clipboard_mac.mm'],
['exclude', 'layout_mac.mm'],
['exclude', 'work_area_watcher_observer.h'],
],
- 'dependencies': [
- '../events/events.gyp:events',
- ],
}, { # use_aura!=1
'sources!': [
'cursor/cursor.cc',
@@ -579,6 +631,52 @@
# 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==0 or use_x11==0', {
+ 'sources!': [
+ 'ime/input_method_chromeos.cc',
+ 'ime/input_method_chromeos.h',
+ ],
+ }],
+ ['chromeos==1', {
+ 'dependencies': [
+ '../../chromeos/chromeos.gyp:chromeos',
+ ],
+ }],
+ ['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',
+ 'ime/chromeos/character_composer.cc',
+ 'ime/chromeos/character_composer.h',
+ ],
+ }],
],
},
{
@@ -606,7 +704,12 @@
'conditions': [
['OS!="ios"', {
'type': 'static_library',
- 'includes': [ 'ime/ime_test_support.gypi' ],
+ 'sources': [
+ 'ime/dummy_input_method.cc',
+ 'ime/dummy_input_method.h',
+ 'ime/dummy_text_input_client.cc',
+ 'ime/dummy_text_input_client.h',
+ ],
}, { # OS=="ios"
# None of the sources in this target are built on iOS, resulting in
# link errors when building targets that depend on this target
« no previous file with comments | « ui/base/ime/ime_unittests.gypi ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698