| Index: views/ime/input_method_ibus.h
|
| diff --git a/views/ime/input_method_ibus.h b/views/ime/input_method_ibus.h
|
| index c9fd1025b670d91a6eb520287fc67280a561cf3d..932e5a22e52336032ec257f462c248bbb60a5914 100644
|
| --- a/views/ime/input_method_ibus.h
|
| +++ b/views/ime/input_method_ibus.h
|
| @@ -71,8 +71,8 @@ class InputMethodIBus : public InputMethodBase {
|
| // Creates |context_| instance asynchronously.
|
| void CreateContext();
|
|
|
| - // Sets |context_| or |fake_context_| and hooks necessary signals.
|
| - void SetContext(IBusInputContext* ic, bool fake);
|
| + // Sets |context_| and hooks necessary signals.
|
| + void SetContext(IBusInputContext* ic);
|
|
|
| // Destroys |context_| instance.
|
| void DestroyContext();
|
| @@ -87,9 +87,6 @@ class InputMethodIBus : public InputMethodBase {
|
| // of |context_| and |context_simple_| accordingly.
|
| void UpdateContextFocusState();
|
|
|
| - // Updates focus state of |fake_context_| accordingly.
|
| - void UpdateFakeContextFocusState();
|
| -
|
| // Process a key returned from the input method.
|
| void ProcessKeyEventPostIME(const KeyEvent& key, guint32 ibus_keycode,
|
| bool handled);
|
| @@ -137,7 +134,6 @@ class InputMethodIBus : public InputMethodBase {
|
| CHROMEG_CALLBACK_0(InputMethodIBus, void, OnHidePreeditText,
|
| IBusInputContext*);
|
| CHROMEG_CALLBACK_0(InputMethodIBus, void, OnDestroy, IBusInputContext*);
|
| - CHROMEG_CALLBACK_0(InputMethodIBus, void, OnFakeDestroy, IBusInputContext*);
|
|
|
| // Event handlers for IBusBus:
|
| CHROMEG_CALLBACK_0(InputMethodIBus, void, OnIBusConnected, IBusBus*);
|
| @@ -159,10 +155,6 @@ class InputMethodIBus : public InputMethodBase {
|
| // The input context for actual text input.
|
| IBusInputContext* context_;
|
|
|
| - // The "fake" input context for hotkey handling, it is only used when there
|
| - // is no focused view, or it doesn't support text input.
|
| - IBusInputContext* fake_context_;
|
| -
|
| // All pending key events. Note: we do not own these object, we just save
|
| // pointers to these object so that we can abandon them when necessary.
|
| // They will be deleted in ProcessKeyEventDone().
|
| @@ -172,10 +164,6 @@ class InputMethodIBus : public InputMethodBase {
|
| // this pointer so that we can receive or abandon the result.
|
| PendingCreateICRequest* pending_create_ic_request_;
|
|
|
| - // The pending request for creating the |context_| instance. We need to keep
|
| - // this pointer so that we can receive or abandon the result.
|
| - PendingCreateICRequest* pending_create_fake_ic_request_;
|
| -
|
| // Pending composition text generated by the current pending key event.
|
| // It'll be sent to the focused text input client as soon as we receive the
|
| // processing result of the pending key event.
|
|
|