diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:50:36 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:50:36 +0000 |
| commit | 17dc1ffebada70c3144c88f693ec828f3e7b2817 (patch) | |
| tree | bebfc759e1be1e89cb30e4d7bd02e379b2c50aef /ui/base/ime/mock_input_method.cc | |
| parent | 9db7d8a03a6d20ae3ba21fbe9153151138a032cc (diff) | |
| download | chromium_src-17dc1ffebada70c3144c88f693ec828f3e7b2817.zip chromium_src-17dc1ffebada70c3144c88f693ec828f3e7b2817.tar.gz chromium_src-17dc1ffebada70c3144c88f693ec828f3e7b2817.tar.bz2 | |
Replace libibus api to chrome dbus module.
This CL depends on codereview.chromium.org/10447022 for testing.
This CL contains following changes:
1. Manages connection between ibus-daemon and chrome manually instead of libibus.
Instead of "connect" and "disconnect" signals, we manually call OnConnected or OnDisconnected in chrome/browser/chromeos/input_method/ibus_controller_impl.cc which launches or kills the ibus-daemon.
2. Manages the life span of input context.
The instance of InputContextClient is managed by DBusThreadManager as singleton object.
The InputContextClient handles only one input context but it is sufficient.
3. Handles input context related method call or signal without libibus.
There are no regression about handling method call and signal handling.
BUG=126947
TEST=unit_tests,chromeos_unittests,ui_unittests,dbus_unittests and manually checked on alex
Review URL: https://chromiumcodereview.appspot.com/10388220
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/ime/mock_input_method.cc')
| -rw-r--r-- | ui/base/ime/mock_input_method.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc index 461f19c..9f6e032 100644 --- a/ui/base/ime/mock_input_method.cc +++ b/ui/base/ime/mock_input_method.cc @@ -22,7 +22,7 @@ namespace { #if defined(USE_X11) -guint32 EventFlagsFromXFlags(unsigned int flags) { +uint32 EventFlagsFromXFlags(unsigned int flags) { return (flags & LockMask ? ui::EF_CAPS_LOCK_DOWN : 0U) | (flags & ControlMask ? ui::EF_CONTROL_DOWN : 0U) | (flags & ShiftMask ? ui::EF_SHIFT_DOWN : 0U) | |