Index: chromeos/dbus/ibus/ibus_engine_service.cc |
diff --git a/chromeos/dbus/ibus/ibus_engine_service.cc b/chromeos/dbus/ibus/ibus_engine_service.cc |
index 58051263cf2b3f46649c6f5386c5af46e3ed3070..546c2646ee820a02261b6ac98b2804e7fb917ee3 100644 |
--- a/chromeos/dbus/ibus/ibus_engine_service.cc |
+++ b/chromeos/dbus/ibus/ibus_engine_service.cc |
@@ -232,8 +232,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
if (engine_handler_ == NULL) |
return; |
engine_handler_->FocusIn(); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles FocusOut method call from ibus-daemon. |
@@ -242,8 +241,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
if (engine_handler_ == NULL) |
return; |
engine_handler_->FocusOut(); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles Enable method call from ibus-daemon. |
@@ -252,8 +250,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
if (engine_handler_ == NULL) |
return; |
engine_handler_->Enable(); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles Disable method call from ibus-daemon. |
@@ -262,8 +259,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
if (engine_handler_ == NULL) |
return; |
engine_handler_->Disable(); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles PropertyActivate method call from ibus-daemon. |
@@ -288,8 +284,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
property_name, |
static_cast<IBusEngineHandlerInterface::IBusPropertyState>( |
property_state)); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles PropertyShow method call from ibus-daemon. |
@@ -305,8 +300,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
return; |
} |
engine_handler_->PropertyShow(property_name); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles PropertyHide method call from ibus-daemon. |
@@ -322,8 +316,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
return; |
} |
engine_handler_->PropertyHide(property_name); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles SetCapability method call from ibus-daemon. |
@@ -340,8 +333,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
} |
engine_handler_->SetCapability( |
static_cast<IBusEngineHandlerInterface::IBusCapability>(capability)); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
void Reset(dbus::MethodCall* method_call, |
@@ -349,8 +341,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
if (engine_handler_ == NULL) |
return; |
engine_handler_->Reset(); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles ProcessKeyEvent method call from ibus-daemon. |
@@ -381,19 +372,18 @@ class IBusEngineServiceImpl : public IBusEngineService { |
keysym, keycode, state, |
base::Bind(&IBusEngineServiceImpl::KeyEventDone, |
weak_ptr_factory_.GetWeakPtr(), |
- base::Unretained( |
- dbus::Response::FromMethodCall(method_call)), |
+ base::Passed(dbus::Response::FromMethodCall(method_call)), |
response_sender)); |
} |
- void KeyEventDone(dbus::Response* response, |
+ void KeyEventDone(scoped_ptr<dbus::Response> response, |
const dbus::ExportedObject::ResponseSender& response_sender, |
bool consume) { |
if (engine_handler_ == NULL) |
return; |
- dbus::MessageWriter writer(response); |
+ dbus::MessageWriter writer(response.get()); |
writer.AppendBool(consume); |
- response_sender.Run(response); |
+ response_sender.Run(response.Pass()); |
} |
// Handles CandidateClicked method call from ibus-daemon. |
@@ -424,8 +414,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
index, |
static_cast<ibus::IBusMouseButton>(button), |
state); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Handles SetSurroundingText method call from ibus-daemon. |
@@ -455,8 +444,7 @@ class IBusEngineServiceImpl : public IBusEngineService { |
} |
engine_handler_->SetSurroundingText(text, cursor_pos, anchor_pos); |
- dbus::Response* response = dbus::Response::FromMethodCall(method_call); |
- response_sender.Run(response); |
+ response_sender.Run(dbus::Response::FromMethodCall(method_call)); |
} |
// Called when the method call is exported. |