chrome.hid: enrich model with report IDs

device/hid/hid_connection_linux.h

Index: device/hid/hid_connection_linux.h
diff --git a/device/hid/hid_connection_linux.h b/device/hid/hid_connection_linux.h
index 108ad881a952485c6d1176d8905e47b019260c39..f81fcc5f84cdea80e13eabebe5dfac41a8188676 100644
--- a/device/hid/hid_connection_linux.h
+++ b/device/hid/hid_connection_linux.h
@@ -5,34 +5,31 @@
 #ifndef DEVICE_HID_HID_CONNECTION_LINUX_H_
 #define DEVICE_HID_HID_CONNECTION_LINUX_H_
 
-#include <queue>
-
 #include "base/files/file.h"
-#include "base/memory/ref_counted.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "device/hid/hid_connection.h"
-#include "device/hid/hid_device_info.h"
 
 namespace device {
 
-class HidConnectionLinux : public HidConnection,
+class HidConnectionLinux : public HidConnection2,
                            public base::MessagePumpLibevent::Watcher {
  public:
-  HidConnectionLinux(HidDeviceInfo device_info, std::string dev_node);
-
-  virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer,
-                    const IOCallback& callback) OVERRIDE;
-  virtual void Write(uint8_t report_id,
-                     scoped_refptr<net::IOBufferWithSize> buffer,
-                     const IOCallback& callback) OVERRIDE;
-  virtual void GetFeatureReport(uint8_t report_id,
-                                scoped_refptr<net::IOBufferWithSize> buffer,
-                                const IOCallback& callback) OVERRIDE;
-  virtual void SendFeatureReport(uint8_t report_id,
-                                 scoped_refptr<net::IOBufferWithSize> buffer,
-                                 const IOCallback& callback) OVERRIDE;
-
-  // Implements base::MessagePumpLibevent::Watcher
+  explicit HidConnectionLinux(HidDeviceInfo device_info, std::string dev_node);

[Ken Rockot(use gerrit already), 2014/06/19 19:29:57]

Only need explicit for single-argument constructors.

[jracle (use Gerrit), 2014/06/19 21:39:37]

oh indeed! Thanks

On 2014/06/19 19:29:57, Ken Rockot wrote:

+
+  // HidConnection implementation.
+  virtual void PlatformWrite(uint8_t report_id,
+                             scoped_refptr<net::IOBufferWithSize> buffer,
+                             const IOCallback& callback) OVERRIDE;
+  virtual void PlatformGetFeatureReport(
+      uint8_t report_id,
+      scoped_refptr<net::IOBufferWithSize> buffer,
+      const IOCallback& callback) OVERRIDE;
+  virtual void PlatformSendFeatureReport(
+      uint8_t report_id,
+      scoped_refptr<net::IOBufferWithSize> buffer,
+      const IOCallback& callback) OVERRIDE;
+
+  // base::MessagePumpLibevent::Watcher implementation.
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
   virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
 
@@ -40,17 +37,11 @@ class HidConnectionLinux : public HidConnection,
   friend class base::RefCountedThreadSafe<HidConnectionLinux>;
   virtual ~HidConnectionLinux();
 
-  void ProcessReadQueue();
   void Disconnect();
 
   base::File device_file_;
   base::MessagePumpLibevent::FileDescriptorWatcher device_file_watcher_;
 
-  std::queue<PendingHidReport> pending_reports_;
-  std::queue<PendingHidRead> pending_reads_;
-
-  base::ThreadChecker thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(HidConnectionLinux);
 };