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

Unified Diff: chromeos/dbus/fake_bluetooth_agent_manager_client.cc

Issue 148293003: Refactor to support default Bluetooth pairing delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wat Created 6 years, 10 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 | « no previous file | device/bluetooth/bluetooth_adapter_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/fake_bluetooth_agent_manager_client.cc
diff --git a/chromeos/dbus/fake_bluetooth_agent_manager_client.cc b/chromeos/dbus/fake_bluetooth_agent_manager_client.cc
index 2672ad56cbd6360683e74ca8617f8726aefa91ef..b2bdf964cc4acd25fc8cc35ed28fe3f3503a284a 100644
--- a/chromeos/dbus/fake_bluetooth_agent_manager_client.cc
+++ b/chromeos/dbus/fake_bluetooth_agent_manager_client.cc
@@ -45,8 +45,11 @@ void FakeBluetoothAgentManagerClient::UnregisterAgent(
const base::Closure& callback,
const ErrorCallback& error_callback) {
VLOG(1) << "UnregisterAgent: " << agent_path.value();
- if (service_provider_ != NULL) {
- error_callback.Run(bluetooth_agent_manager::kErrorInvalidArguments,
+ if (service_provider_ == NULL) {
+ error_callback.Run(bluetooth_agent_manager::kErrorDoesNotExist,
+ "No agent registered");
+ } else if (service_provider_->object_path_ != agent_path) {
+ error_callback.Run(bluetooth_agent_manager::kErrorDoesNotExist,
"Agent still registered");
} else {
callback.Run();
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698