| Index: chrome/browser/chromeos/input_method/mock_input_method_engine.cc
|
| diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc
|
| index 2c3228a9faea7e33cde720dd8425203fe6511bfc..17fc6f0579205bedbd6b81fb51d98268c4e36df1 100644
|
| --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc
|
| +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc
|
| @@ -8,18 +8,12 @@
|
|
|
| namespace chromeos {
|
|
|
| -MockInputMethodEngine::MockInputMethodEngine(
|
| - const input_method::InputMethodDescriptor& descriptor)
|
| - : descriptor_(descriptor) {}
|
| +MockInputMethodEngine::MockInputMethodEngine() {}
|
|
|
| MockInputMethodEngine::~MockInputMethodEngine() {}
|
|
|
| -const input_method::InputMethodDescriptor&
|
| -MockInputMethodEngine::GetDescriptor() const {
|
| - return descriptor_;
|
| -}
|
| -
|
| -void MockInputMethodEngine::NotifyImeReady() {
|
| +const std::string& MockInputMethodEngine::GetActiveEngineId() const {
|
| + return active_engine_id_;
|
| }
|
|
|
| bool MockInputMethodEngine::SetComposition(
|
| @@ -107,10 +101,12 @@ void MockInputMethodEngine::FocusIn(
|
| void MockInputMethodEngine::FocusOut() {
|
| }
|
|
|
| -void MockInputMethodEngine::Enable() {
|
| +void MockInputMethodEngine::Enable(const std::string& engine_id) {
|
| + active_engine_id_ = engine_id;
|
| }
|
|
|
| void MockInputMethodEngine::Disable() {
|
| + active_engine_id_ = "";
|
| }
|
|
|
| void MockInputMethodEngine::PropertyActivate(const std::string& property_name) {
|
|
|