| Index: chrome/browser/chromeos/input_method/mock_input_method_engine.h
|
| diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h
|
| index c22ac5d56d20e1c6a4de67da6e769f9b02804673..5d8810bd713e2f1f8df498d7e41154dd6b05b968 100644
|
| --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h
|
| +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h
|
| @@ -32,14 +32,11 @@ struct KeyEventHandle;
|
|
|
| class MockInputMethodEngine : public InputMethodEngineInterface {
|
| public:
|
| - explicit MockInputMethodEngine(
|
| - const input_method::InputMethodDescriptor& descriptor);
|
| + explicit MockInputMethodEngine();
|
| virtual ~MockInputMethodEngine();
|
|
|
| // InputMethodEngineInterface overrides.
|
| - virtual const input_method::InputMethodDescriptor& GetDescriptor()
|
| - const OVERRIDE;
|
| - virtual void NotifyImeReady() OVERRIDE;
|
| + virtual const std::string& GetActiveEngineId() const OVERRIDE;
|
| virtual bool SetComposition(int context_id,
|
| const char* text,
|
| int selection_start,
|
| @@ -75,7 +72,7 @@ class MockInputMethodEngine : public InputMethodEngineInterface {
|
| virtual void FocusIn(
|
| const IMEEngineHandlerInterface::InputContext& input_context) OVERRIDE;
|
| virtual void FocusOut() OVERRIDE;
|
| - virtual void Enable() OVERRIDE;
|
| + virtual void Enable(const std::string& engine_id) OVERRIDE;
|
| virtual void Disable() OVERRIDE;
|
| virtual void PropertyActivate(const std::string& property_name) OVERRIDE;
|
| virtual void Reset() OVERRIDE;
|
| @@ -91,8 +88,7 @@ class MockInputMethodEngine : public InputMethodEngineInterface {
|
| }
|
|
|
| private:
|
| - // Descriptor of this input method.
|
| - input_method::InputMethodDescriptor descriptor_;
|
| + std::string active_engine_id_;
|
|
|
| // The current candidate window property.
|
| CandidateWindowProperty candidate_window_property_;
|
|
|