summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorspang <spang@chromium.org>2015-02-05 11:55:12 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-05 19:56:47 +0000
commit1c36facc53f4a0038f2e2e482c78a65438cc8ec4 (patch)
tree2aa5ab5a94f2cf674dbc2872c22795b94e74c74e /content/content_common.gypi
parent4514d31cc051b2099cd6fcc1a0a2a71bb1c5532e (diff)
downloadchromium_src-1c36facc53f4a0038f2e2e482c78a65438cc8ec4.zip
chromium_src-1c36facc53f4a0038f2e2e482c78a65438cc8ec4.tar.gz
chromium_src-1c36facc53f4a0038f2e2e482c78a65438cc8ec4.tar.bz2
Split ui/base/ime into a new component (reland with windows GN fix)
The IME code in ui/base/ime depends on ui/ozone to support keyboard control (via the InputController interface). This dependency is currently missing from the build. Unfortunately, we cannot simply add this dependency, because ui/ozone depends on code from ui/base/cursor and ui/base/resource (for cursor bitmaps). Break this cycle by componentizing ui/base/ime & add a dependency from the new ui/base/ime component to ui/ozone. This also helps clean things up a bit because iOS builds ui/base but not ui/base/ime. So there is already a fault line here. The handful of IME tests are left as part of ui_base_unittests. BUG=445627 TEST=gn gen out_gn_ozone --args='os="chromeos" use_ozone=true is_component_build=true' && ninja -C out_gn_ozone chrome ozone_unittests (along with other needed changes) TBR=jam Committed: https://crrev.com/2321ca1b99c1a8e9a90e48a9cd50f6446a7e5e82 Cr-Commit-Position: refs/heads/master@{#314815} Review URL: https://codereview.chromium.org/889323003 Cr-Commit-Position: refs/heads/master@{#314860}
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index b78f88d..16afe99 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -12,6 +12,7 @@
'../third_party/WebKit/public/blink_headers.gyp:blink_headers',
'../third_party/icu/icu.gyp:icuuc',
'../ui/accessibility/accessibility.gyp:accessibility',
+ '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
'../ui/base/ui_base.gyp:ui_base',
'../ui/events/ipc/events_ipc.gyp:events_ipc',
'../ui/gfx/gfx.gyp:gfx',