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

Unified Diff: device/hid/hid_service_linux.h

Issue 1233753002: Use permission_broker's OpenPath method to open HID devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/hid/hid_service_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/hid_service_linux.h
diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h
index 3cb75c5696389726c033bb21c9579d5252e73be8..66cfbd3a4412a8982c4cff06666b2f35f09e4800 100644
--- a/device/hid/hid_service_linux.h
+++ b/device/hid/hid_service_linux.h
@@ -11,6 +11,10 @@
#include "device/hid/hid_device_info.h"
#include "device/hid/hid_service.h"
+namespace dbus {
+class FileDescriptor;
+}
+
namespace device {
class HidConnection;
@@ -38,11 +42,15 @@ class HidServiceLinux : public HidService {
// functions are static and the necessary parameters are passed as a single
// struct.
#if defined(OS_CHROMEOS)
- static void OnRequestPathAccessComplete(scoped_ptr<ConnectParams> params,
- bool success);
-#endif // defined(OS_CHROMEOS)
- static void OpenDevice(scoped_ptr<ConnectParams> params);
- static void ConnectImpl(scoped_ptr<ConnectParams> params);
+ static void OnPathOpened(scoped_ptr<ConnectParams> params,
+ dbus::FileDescriptor fd);
+ static void ValidateFdOnBlockingThread(scoped_ptr<ConnectParams> params,
+ dbus::FileDescriptor fd);
+#else
+ static void OpenOnBlockingThread(scoped_ptr<ConnectParams> params);
+#endif
+ static void FinishOpen(scoped_ptr<ConnectParams> params);
+ static void CreateConnection(scoped_ptr<ConnectParams> params);
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
« no previous file with comments | « no previous file | device/hid/hid_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698