diff options
| author | spang <spang@chromium.org> | 2015-02-05 11:55:12 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 19:56:47 +0000 |
| commit | 1c36facc53f4a0038f2e2e482c78a65438cc8ec4 (patch) | |
| tree | 2aa5ab5a94f2cf674dbc2872c22795b94e74c74e /ash | |
| parent | 4514d31cc051b2099cd6fcc1a0a2a71bb1c5532e (diff) | |
| download | chromium_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 'ash')
| -rw-r--r-- | ash/BUILD.gn | 3 | ||||
| -rw-r--r-- | ash/ash.gyp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index f1c5eb1..401f456 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -36,6 +36,7 @@ component("ash") { "//ui/app_list", "//ui/aura", "//ui/base", + "//ui/base/ime", "//ui/compositor", "//ui/events", "//ui/events:events_base", @@ -229,6 +230,7 @@ static_library("ash_shell_lib") { "//ui/app_list", "//ui/aura", "//ui/base", + "//ui/base/ime", "//ui/compositor", "//ui/events", "//ui/events:events_base", @@ -266,6 +268,7 @@ test("ash_unittests") { "//ui/aura", "//ui/aura:test_support", "//ui/base", + "//ui/base/ime", "//ui/base:test_support", "//ui/compositor", "//ui/compositor:test_support", diff --git a/ash/ash.gyp b/ash/ash.gyp index 8861a16..f582504 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -887,6 +887,7 @@ '../ui/accessibility/accessibility.gyp:accessibility', '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', + '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/events/devices/events_devices.gyp:events_devices', @@ -1067,6 +1068,7 @@ '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', + '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', '../ui/base/ui_base.gyp:ui_base', '../ui/base/ui_base.gyp:ui_base_test_support', '../ui/compositor/compositor.gyp:compositor', @@ -1176,6 +1178,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', + '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', '../ui/base/ui_base.gyp:ui_base', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', |