Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/bluetooth_agent_service_provider.cc

Issue 12092061: Code cleaning: Uses scoped_ptr<> to express ownership rather than writing ownership in comments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added chrome/browser/password_manager/native_backend_kwallet_x_unitte\ Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/blocking_method_caller_unittest.cc ('k') | chromeos/dbus/ibus/ibus_engine_factory_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/bluetooth_agent_service_provider.cc
diff --git a/chromeos/dbus/bluetooth_agent_service_provider.cc b/chromeos/dbus/bluetooth_agent_service_provider.cc
index 9543cc5c8259a55e8fb8457e91ccd5def45c8b00..2b3811caeac483ea57eeb0e039897b4e8b6ebcb9 100644
--- a/chromeos/dbus/bluetooth_agent_service_provider.cc
+++ b/chromeos/dbus/bluetooth_agent_service_provider.cc
@@ -139,8 +139,7 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
delegate_->Release();
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- response_sender.Run(response);
+ response_sender.Run(dbus::Response::FromMethodCall(method_call));
}
// Called by dbus:: when the Release method is exported.
@@ -235,8 +234,7 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
delegate_->DisplayPinCode(device_path, pincode);
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- response_sender.Run(response);
+ response_sender.Run(dbus::Response::FromMethodCall(method_call));
}
// Called by dbus:: when the DisplayPinCode method is exported.
@@ -267,8 +265,7 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
delegate_->DisplayPasskey(device_path, passkey);
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- response_sender.Run(response);
+ response_sender.Run(dbus::Response::FromMethodCall(method_call));
}
// Called by dbus:: when the DisplayPasskey method is exported.
@@ -404,8 +401,7 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
delegate_->Cancel();
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- response_sender.Run(response);
+ response_sender.Run(dbus::Response::FromMethodCall(method_call));
}
// Called by dbus:: when the Cancel method is exported.
@@ -425,22 +421,25 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
switch (status) {
case Delegate::SUCCESS: {
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- dbus::MessageWriter writer(response);
+ scoped_ptr<dbus::Response> response(
+ dbus::Response::FromMethodCall(method_call));
+ dbus::MessageWriter writer(response.get());
writer.AppendString(pincode);
- response_sender.Run(response);
+ response_sender.Run(response.Pass());
break;
}
case Delegate::REJECTED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorRejected, "rejected");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorRejected, "rejected")
+ .PassAs<dbus::Response>());
break;
}
case Delegate::CANCELLED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorCanceled, "canceled");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorCanceled, "canceled")
+ .PassAs<dbus::Response>());
break;
}
default:
@@ -457,22 +456,25 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
switch (status) {
case Delegate::SUCCESS: {
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- dbus::MessageWriter writer(response);
+ scoped_ptr<dbus::Response> response(
+ dbus::Response::FromMethodCall(method_call));
+ dbus::MessageWriter writer(response.get());
writer.AppendUint32(passkey);
- response_sender.Run(response);
+ response_sender.Run(response.Pass());
break;
}
case Delegate::REJECTED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorRejected, "rejected");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorRejected, "rejected")
+ .PassAs<dbus::Response>());
break;
}
case Delegate::CANCELLED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorCanceled, "canceled");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorCanceled, "canceled")
+ .PassAs<dbus::Response>());
break;
}
default:
@@ -488,20 +490,21 @@ class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
switch (status) {
case Delegate::SUCCESS: {
- dbus::Response* response = dbus::Response::FromMethodCall(method_call);
- response_sender.Run(response);
+ response_sender.Run(dbus::Response::FromMethodCall(method_call));
break;
}
case Delegate::REJECTED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorRejected, "rejected");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorRejected, "rejected")
+ .PassAs<dbus::Response>());
break;
}
case Delegate::CANCELLED: {
- dbus::ErrorResponse* response = dbus::ErrorResponse::FromMethodCall(
- method_call, bluetooth_agent::kErrorCanceled, "canceled");
- response_sender.Run(response);
+ response_sender.Run(
+ dbus::ErrorResponse::FromMethodCall(
+ method_call, bluetooth_agent::kErrorCanceled, "canceled")
+ .PassAs<dbus::Response>());
break;
}
default:
« no previous file with comments | « chromeos/dbus/blocking_method_caller_unittest.cc ('k') | chromeos/dbus/ibus/ibus_engine_factory_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698