Revise IBusEngineService.

chromeos/dbus/ibus/ibus_engine_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 195 matching lines @@
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
   virtual void RequireSurroundingText() OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kRequireSurroundingTextSignal);
     exported_object_->SendSignal(&signal);
   }
 
+  virtual void CommitText(const std::string& text) OVERRIDE {
+    dbus::Signal signal(ibus::engine::kServiceInterface,
+                        ibus::engine::kCommitTextSignal);
+    dbus::MessageWriter writer(&signal);
+    ibus::AppendStringAsIBusText(text, &writer);
+    exported_object_->SendSignal(&signal);
+  }
+
  private:
   // Handles FocusIn method call from ibus-daemon.
   void FocusIn(dbus::MethodCall* method_call,
                dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(engine_handler_.get());
     engine_handler_->FocusIn();
     dbus::Response* response = dbus::Response::FromMethodCall(method_call);
     response_sender.Run(response);
   }
 
@@ skipping 122 matching lines @@
                    << method_call->ToString();
       return;
     }
     uint32 state = 0;
     if (!reader.PopUint32(&state)) {
       LOG(WARNING) << "ProcessKeyEvent called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     DCHECK(engine_handler_.get());
-    bool consume = engine_handler_->ProcessKeyEvent(keysym, keycode, state);
-    dbus::Response* response = dbus::Response::FromMethodCall(method_call);
+    engine_handler_->ProcessKeyEvent(
+        keysym, keycode, state,
+        base::Bind(&IBusEngineServiceImpl::KeyEventDone,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   base::Unretained(
+                       dbus::Response::FromMethodCall(method_call)),
+                   response_sender));
+  }
+
+  void KeyEventDone(dbus::Response* response,
+                    const dbus::ExportedObject::ResponseSender& response_sender,
+                    bool consume) {
     dbus::MessageWriter writer(response);
     writer.AppendBool(consume);
     response_sender.Run(response);
   }
 
   // Handles CandidateClicked method call from ibus-daemon.
   void CandidateClicked(dbus::MethodCall* method_call,
                         dbus::ExportedObject::ResponseSender response_sender) {
     dbus::MessageReader reader(method_call);
     uint32 index = 0;
@@ skipping 87 matching lines @@
                              bool is_visible,
                              IBusEnginePreeditFocusOutMode mode) OVERRIDE {}
   virtual void UpdateAuxiliaryText(const ibus::IBusText& ibus_text,
                                    bool is_visible) OVERRIDE {}
   virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
                                  bool is_visible) OVERRIDE {}
   virtual void UpdateProperty(const ibus::IBusProperty& property) OVERRIDE {}
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
                                uint32 state) OVERRIDE {}
   virtual void RequireSurroundingText() OVERRIDE {}
+  virtual void CommitText(const std::string& text) OVERRIDE {}
+
  private:
   DISALLOW_COPY_AND_ASSIGN(IBusEngineServiceStubImpl);
 };
 
 IBusEngineService::IBusEngineService() {
 }
 
 IBusEngineService::~IBusEngineService() {
 }
 
 // static
 IBusEngineService* IBusEngineService::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new IBusEngineServiceImpl(bus, object_path);
   else
     return new IBusEngineServiceStubImpl();
 }
 
 }  // namespace chromeos