| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // TODO(yusukes): Remove this class when TOUCH_UI migrates to Aura. For Aura, |
| 6 // ui/base/ime/input_method_* classes are available. |
| 7 |
| 5 #include "ui/views/ime/input_method_ibus.h" | 8 #include "ui/views/ime/input_method_ibus.h" |
| 6 | 9 |
| 7 #include <ibus.h> | 10 #include <ibus.h> |
| 8 #if defined(TOUCH_UI) | 11 #if defined(TOUCH_UI) |
| 9 #include <X11/Xlib.h> | 12 #include <X11/Xlib.h> |
| 10 #include <X11/Xutil.h> | 13 #include <X11/Xutil.h> |
| 11 #endif | 14 #endif |
| 12 | 15 |
| 13 #include <algorithm> | 16 #include <algorithm> |
| 14 #include <cstring> | 17 #include <cstring> |
| (...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 952 DCHECK_EQ(GetIBus(), bus); | 955 DCHECK_EQ(GetIBus(), bus); |
| 953 DCHECK(data); | 956 DCHECK(data); |
| 954 IBusInputContext* ic = | 957 IBusInputContext* ic = |
| 955 ibus_bus_create_input_context_async_finish(bus, res, NULL); | 958 ibus_bus_create_input_context_async_finish(bus, res, NULL); |
| 956 if (ic) | 959 if (ic) |
| 957 data->StoreOrAbandonInputContext(ic); | 960 data->StoreOrAbandonInputContext(ic); |
| 958 delete data; | 961 delete data; |
| 959 } | 962 } |
| 960 | 963 |
| 961 } // namespace views | 964 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8687027:
IME (input method editor) support for Aura, part 2 of 3: Add views::InputMethodBridge (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src