Revert of Split ui/base/ime into a new component (patchset #4 id:60001 of https:...
commit5b27993c4ed9bb439c693b86e7f1190c4d49b6e0
authorccameron <ccameron@chromium.org>
Thu, 5 Feb 2015 16:28:31 +0000 (5 08:28 -0800)
committerCommit bot <commit-bot@chromium.org>
Thu, 5 Feb 2015 16:29:25 +0000 (5 16:29 +0000)
treec6acc15276d98531ba5c50a1bf4c8a991ca9257a
parent4d5b877dcab754769ee594a043c75e9bcf27d776
Revert of Split ui/base/ime into a new component (patchset #4 id:60001 of https://codereview.chromium.org/889323003/)

Reason for revert:
Windows builds failing with

ERROR at //ui/base/ime/BUILD.gn:170:5: Undefined variable for +=.
    libs += [ "imm32.lib" ]
    ^---
I don't have something with this name in scope now.

http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/4403/steps/gn/logs/stdio

(perhaps missed a .gn update)?

Original issue's description:
> Split ui/base/ime into a new component
>
> 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}

TBR=sky@chromium.org,thakis@chromium.org,jam@chromium.org,yukishiino@chromium.org,spang@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=445627

Review URL: https://codereview.chromium.org/895363005

Cr-Commit-Position: refs/heads/master@{#314823}
79 files changed:
ash/BUILD.gn
ash/ash.gyp
chrome/browser/BUILD.gn
chrome/browser/extensions/BUILD.gn
chrome/browser/ui/BUILD.gn
chrome/browser/ui/libgtk2ui/BUILD.gn
chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
chrome/chrome_browser.gypi
chrome/chrome_browser_chromeos.gypi
chrome/chrome_browser_extensions.gypi
chrome/chrome_browser_ui.gypi
content/browser/BUILD.gn
content/common/BUILD.gn
content/content_browser.gypi
content/content_common.gypi
content/content_shell.gypi
content/content_tests.gypi
content/shell/BUILD.gn
content/test/BUILD.gn
extensions/shell/BUILD.gn
extensions/shell/app_shell.gyp
ui/aura/BUILD.gn
ui/aura/aura.gyp
ui/base/BUILD.gn
ui/base/ime/BUILD.gn [deleted file]
ui/base/ime/candidate_window.h
ui/base/ime/chromeos/character_composer.h
ui/base/ime/chromeos/component_extension_ime_manager.h
ui/base/ime/chromeos/composition_text.h
ui/base/ime/chromeos/extension_ime_util.h
ui/base/ime/chromeos/fake_ime_keyboard.h
ui/base/ime/chromeos/fake_input_method_delegate.h
ui/base/ime/chromeos/ime_bridge.h
ui/base/ime/chromeos/ime_keyboard.h
ui/base/ime/chromeos/ime_keyboard_ozone.h
ui/base/ime/chromeos/ime_keyboard_x11.h
ui/base/ime/chromeos/ime_keymap.h
ui/base/ime/chromeos/input_method_descriptor.h
ui/base/ime/chromeos/input_method_manager.h
ui/base/ime/chromeos/input_method_whitelist.h
ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h
ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
ui/base/ime/chromeos/mock_ime_engine_handler.h
ui/base/ime/chromeos/mock_ime_input_context_handler.h
ui/base/ime/composition_text.h
ui/base/ime/composition_text_util_pango.h
ui/base/ime/dummy_input_method_delegate.h
ui/base/ime/infolist_entry.h
ui/base/ime/input_method_auralinux.h
ui/base/ime/input_method_base.h
ui/base/ime/input_method_chromeos.h
ui/base/ime/input_method_delegate.h
ui/base/ime/input_method_factory.h
ui/base/ime/input_method_initializer.h
ui/base/ime/input_method_mac.h
ui/base/ime/input_method_minimal.h
ui/base/ime/input_method_observer.h
ui/base/ime/input_method_win.h
ui/base/ime/linux/linux_input_method_context.h
ui/base/ime/linux/linux_input_method_context_factory.h
ui/base/ime/mock_input_method.h
ui/base/ime/remote_input_method_delegate_win.h
ui/base/ime/remote_input_method_win.h
ui/base/ime/text_input_client.h
ui/base/ime/text_input_focus_manager.h
ui/base/ime/ui_base_ime.gyp [deleted file]
ui/base/ime/ui_base_ime_export.h [deleted file]
ui/base/ime/win/imm32_manager.h
ui/base/ime/win/tsf_input_scope.h
ui/base/ui_base.gyp
ui/base/ui_base_tests.gyp
ui/chromeos/BUILD.gn
ui/chromeos/ui_chromeos.gyp
ui/keyboard/BUILD.gn
ui/keyboard/keyboard.gyp
ui/views/BUILD.gn
ui/views/views.gyp
ui/wm/BUILD.gn
ui/wm/wm.gyp