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

Unified Diff: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc

Issue 255053002: chrome.bluetoothLowEnergy: Implement getCharacteristics. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
index 4e424dde9ef1439144f4ca435b05ffa1bc097eab..d6440730912510840bab501d18b01a2cb6745473 100644
--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
@@ -38,6 +38,32 @@ void DoWorkCallback(const base::Callback<bool()>& callback) {
callback.Run();
}
+// Converts an apibtle::Characteristic to a base::Value. This function is
+// necessary, as json_schema_compiler::util::AddItemToList has no template
+// specialization for user defined enums, which get treated as integers. This is
+// because Characteristic contains a list of enum CharacteristicProperty.
rpaquay 2014/04/29 17:38:30 I would open a bug for this, it sounds like an ove
armansito 2014/04/29 19:31:19 Filed bug and added a TODO here.
rpaquay 2014/04/29 19:33:12 Thanks!
+scoped_ptr<base::DictionaryValue> CharacteristicToValue(
+ apibtle::Characteristic* from) {
+ // Copy the properties. Use Characteristic::ToValue to generate the result
+ // dictionary without the properties, to prevent json_schema_compiler from
+ // failing.
+ std::vector<apibtle::CharacteristicProperty> properties = from->properties;
+ from->properties.clear();
+ scoped_ptr<base::DictionaryValue> to = from->ToValue();
+
+ // Manually set each property.
+ scoped_ptr<base::ListValue> property_list(new base::ListValue());
+ for (std::vector<apibtle::CharacteristicProperty>::iterator iter =
+ properties.begin();
+ iter != properties.end();
+ ++iter)
+ property_list->Append(new base::StringValue(apibtle::ToString(*iter)));
+
+ to->Set("properties", property_list.release());
+
+ return to.Pass();
+}
+
} // namespace
namespace extensions {
@@ -175,10 +201,48 @@ bool BluetoothLowEnergyGetCharacteristicFunction::DoWork() {
}
bool BluetoothLowEnergyGetCharacteristicsFunction::DoWork() {
- // TODO(armansito): Implement.
- SetError("Call not supported.");
- SendResponse(false);
- return false;
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+ BluetoothLowEnergyEventRouter* event_router =
+ GetEventRouter(browser_context());
+
+ // The adapter must be initialized at this point, but return an error instead
+ // of asserting.
+ if (!event_router->HasAdapter()) {
+ SetError(kErrorAdapterNotInitialized);
+ SendResponse(false);
+ return false;
+ }
+
+ scoped_ptr<apibtle::GetCharacteristics::Params> params(
+ apibtle::GetCharacteristics::Params::Create(*args_));
+ EXTENSION_FUNCTION_VALIDATE(params.get() != NULL);
+
+ std::string service_id = params->service_id;
+
+ BluetoothLowEnergyEventRouter::CharacteristicList characteristic_list;
+ if (!event_router->GetCharacteristics(service_id, &characteristic_list)) {
+ SetError(
+ base::StringPrintf(kErrorServiceNotFoundFormat, service_id.c_str()));
+
+ SendResponse(false);
+ return false;
+ }
+
+ // Manually construct the result instead of using
+ // apibtle::GetCharacteristics::Result::Create as it doesn't convert lists of
+ // enums correctly.
+ scoped_ptr<base::ListValue> result(new base::ListValue());
+ for (BluetoothLowEnergyEventRouter::CharacteristicList::iterator iter =
+ characteristic_list.begin();
+ iter != characteristic_list.end();
+ ++iter)
+ result->Append(CharacteristicToValue(iter->get()).release());
+
+ SetResult(result.release());
+ SendResponse(true);
+
+ return true;
}
bool BluetoothLowEnergyGetIncludedServicesFunction::DoWork() {
« no previous file with comments | « no previous file | chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698