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

Unified Diff: extensions/browser/api/hid/hid_api.cc

Issue 641203003: Read HID report descriptor from sysfs and request permission on connect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary code. Created 6 years, 2 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 | « extensions/browser/api/hid/hid_api.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/hid/hid_api.cc
diff --git a/extensions/browser/api/hid/hid_api.cc b/extensions/browser/api/hid/hid_api.cc
index 198dd59bc4c010d0f50ed41de7d32513cb88280c..bbea4277ca37bd08db1a5ef325940633ce4603da 100644
--- a/extensions/browser/api/hid/hid_api.cc
+++ b/extensions/browser/api/hid/hid_api.cc
@@ -141,26 +141,43 @@ bool HidConnectFunction::Prepare() {
}
void HidConnectFunction::AsyncWorkStart() {
- device::HidDeviceInfo device_info;
- if (!device_manager_->GetDeviceInfo(parameters_->device_id, &device_info)) {
+ if (!device_manager_->GetDeviceInfo(parameters_->device_id, &device_info_)) {
CompleteWithError(kErrorInvalidDeviceId);
return;
}
- if (!device_manager_->HasPermission(extension(), device_info)) {
+ if (!device_manager_->HasPermission(extension(), device_info_)) {
LOG(WARNING) << "Insufficient permissions to access device.";
CompleteWithError(kErrorPermissionDenied);
return;
}
+#if defined(OS_CHROMEOS)
+ HidService* hid_service = device::DeviceClient::Get()->GetHidService();
+ DCHECK(hid_service);
+ hid_service->RequestAccess(
+ device_info_.device_id,
+ base::Bind(&HidConnectFunction::OnRequestAccessComplete, this));
+#else
+ OnRequestAccessComplete(true);
+#endif
+}
+
+void HidConnectFunction::OnRequestAccessComplete(bool success) {
+ if (!success) {
+ CompleteWithError(kErrorPermissionDenied);
+ return;
+ }
+
HidService* hid_service = device::DeviceClient::Get()->GetHidService();
DCHECK(hid_service);
scoped_refptr<HidConnection> connection =
- hid_service->Connect(device_info.device_id);
+ hid_service->Connect(device_info_.device_id);
if (!connection.get()) {
CompleteWithError(kErrorFailedToOpenDevice);
return;
}
+
int connection_id = connection_manager_->Add(
new HidConnectionResource(extension_->id(), connection));
SetResult(PopulateHidConnection(connection_id, connection));
« no previous file with comments | « extensions/browser/api/hid/hid_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698